Improved search for items.