added CategoryManagement & updated Search