Mob 2377 fix other cat

Whaaat? If we really need check that's so complex then maybe it's worthwhile to extract it to utils?