OP-764 - fixing window.template issues