GLRIDB-374: interim (fast) solution to remove 'Tempalate' keyword from template tags