Category Tree improvements