Better names, separated search from directions

Also updated waze to have parametrized 'navigate' parameter @vvarp