fix skip and remove query string evaluation for ES use of DefaultGraphQuery