Additional fix for OPENIG-230
OPENIG-230, fixes for categories
RC 2 for OPENIG-230