Move filter from GQuery to SelectorEngine