templates validation fixes / version