WEB-5601 deep query modificators rewrite