ECMS-4726: Incorrect UI Add/Edit View