Move to a joins-only simple search for items.

See #518