Add several updates including handling of the bus route variants.