fix small issues with prepopulated template values