--- a/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb
+++ b/maxious-canberra-transit-feed/05-addbetweenpointstotimetables.rb
@@ -23,9 +23,11 @@
     timetable["between_stops"] = {}
     for i in 0..timetable["time_points"].length-2
 	begin
-	  searchFrom = timetable["time_points"][i].escape_single_quotes.split("-")[0].strip
-	  searchTo = timetable["time_points"][i+1].escape_single_quotes.split("-")[0].strip
-	  
+	  searchFrom = timetable["time_points"][i].escape_single_quotes.split("(")[0].strip
+	  searchTo = timetable["time_points"][i+1].escape_single_quotes.split("(")[0].strip
+	#  print "SELECT * from between_stops
+	#	  WHERE fromlocation = '#{searchFrom}'
+	#  AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'"
 	  between_points = connbus.exec("SELECT * from between_stops
 		  WHERE fromlocation = '#{searchFrom}'
 	  AND tolocation = '#{searchTo}' AND routes LIKE '%#{route_name};%'")
@@ -34,8 +36,9 @@
 		#conn.close() if conn
 	end
 	between_points.each do |between_point_row|
-	  timetable["between_stops"][timetable["time_points"][i] + '-' +timetable["time_points"][i+1]] \
-	      = between_point_row['points'].split(";");
+		points = between_point_row['points'].split(";")
+		points.delete("")
+		timetable["between_stops"][timetable["time_points"][i] + '-' +timetable["time_points"][i+1]] = points;
 	end
     end
     #pp timetable["between_stops"]