Resolve the category subcategory navigation conflicts

FOR-123