(masterDataManagement) Some fixes and enhancements