I believe filters and queries are in the process of being merged. Quite possibly they are moving towards having some kind of planner.