Fixed fallback to default entity type