[OE-4006] - add drop down values Plus more current management plan form changes