After adding category_group optimization