Dileep | Fixing entity type random order issue