Fix query & subject filters.