More django template syntax changes