Fix bugs and tune filter selection with some great results