Filter clean-up

Arranged filters by semi-alphabetical order, removed duplicates.