fix order for reading out entity data