ECMS-4918: UI Template defects