Add types for QueryFilters which flow down to Query<> and QueryKey/DataTag types

Add types for QueryFilters which flow down to Query<> and QueryKey/DataTag types #2557