Refactor query service
Refactor query service

lucidworks/lucidworks-view,AlexKolonitsky/lucidworks-view,AlexKolonitsky/lucidworks-view,lucidworks/lucidworks-view,AlexKolonitsky/lucidworks-view,lucidworks/lucidworks-view