Fix model to filter class name