Merge "RCLFilters: Bring back Saved Queries"