VROOZI-556: Fix category generation issues.