Adding subcategory search and sorting.