Removed matched_filters in favor for matched_queries.

Closes #3644