Resolves #1834: MAC Client adds all filters when setting up a new query