Changed behavior of category and subcategory selection