Well, not sure that'll work all the time. The street I'm living in exists in at least 4 different official(!) writings. There are 2 different street signs and two additional versions in official town documentation. The street signs contain a Dr. and a Doktor and all words are seperated by dashes. Well, town documentation has the same street in two additional versions. One without the dot after the Dr. and one without the dashes.
So, how will we handle such cases? I fear there are more examples like mine ... :-(