Altered sql scripts with valid values for waypoints