Switch to using type ("S2" vs "FJRN") for differentiating between regional trains and s-tog (corresponding change R697 on TrainInfoService)