consistent tag closing accross template files