Updated monolithic patch to fix manipulate cat bug
Updated for fix manipulate_categories bugs