Fix help text, incorporate deprecated command search.