improve entity importer performance
Merge pull request #558 from dennishendriksen/master

Improve entity importer performance