Some more work on adding new targets to the item finder.