Added tweaked filter system