Fixed bugs

Category match