Fix issue with Custom Entity Categories not saving