Merges in changes made to twain search.