[#26] Improvements of categories tree.