more fıxes for template usage