correcting templates for entities