More work on filter UI, renamed some vars