Workaround for GroupedSelection caching
Changing entity factory back to plain DI + some fixes