Some changes for better testability
Fixed: Word seperation not recognized correctly (ex. Zürich HB would be parsed as ZürichHB)