Change controller to use new first_category_name_in_each_type method
Update model specs