[simeon] more refactoring.... and 2 scenarios for DRM Type in Edit Task Form