Added autocompletion for second arg to /waypoint