VROOZI-556: Fix category tree issues