Fix streaming and finding by ID.