Fixing multiple problems in the index bake template