Added back classes for advanced search