PLATFORM-403: Fixed add/remove Category