UX and filter bug fixes