Rename Query/Build Query to Filter/Set Filter to better reflect action