* Fix rendering of react query editors

* Refactor solution for improved readability

* Update

* Add test coverage

* Refactor