Corrected address string extraction