fix category-related issues.