More work on item finder