UX improvements - fixed filters