Changed filter to query