UI behaviour improvements to filtering