minor refactoring to remove indexed_terms variable
moved Verify to before indexing and search
moved Update to before search ordering
terminate early if nothing is selected