changed template tags structure