Hotfix/reindex commit on each entity