Cleaned up filter forms
Well, a little bit more. More to do