OP-421 Fixed DashboardTemplateController