NZ-21 - Fix regex for XXX category