refactored category-tags