Fix the category subcategory navigation conflicts