Refactored to 3.1 and simplified filter settings