CC-21 Fixed bug when category is null on update