Minor modifications to filter-list