discovery2items: Fix up to match discovery results.