More fixes in templates for django 1.5