minor functionality of fixes in template