Fix stop grouping logic for new GTFS feed
Fix stop grouping logic for new GTFS feed