Removed default entityId in entity response objects