Clean up classes for advanced filters form