Expand field search scope; add item type