[CHANGE] Small code refactoring [FIX] Proper category name display