WEB-5601 deep query modificators rewrite
Merge pull request #84 from flyvictor/WEB-5601-deep-query-modificators-rewrite

WEB-5601 deep query modificators rewrite