Fix filterquery not working when q is set for ElasticSearch