Fixed issues with field tempaltes