Fixing more problems in the bake view template