finalized merge changes for search tool

author: nhhughes