Editing template improvements
Entity lookup improvements

Still to do: change for the importer.