template blocks fixes