Preserve query and previous filter when user select new filter