finish category search refactor
refactor subcategory report