Fixing Waypoint Editor and Survey Dialog

Fixing problems presented in issue #294 and on #293.