Tweak subway (add RER support)