Added more classes to first level filter