Fixed saving moved templates