UI Refinements on filtering