some minor refinement of search options
some minor cleanup