Bug#77327 Rework mashup to save quick filters

Should work quicker