Added query_builder for EntityFilterType