(masterDataManagement) some fixes and enhancements