Merge "RCFilters: Allow setting a new query as default"