fixed master templates
minor changes due field refactoring