Fixed some more bugs related to street name expanding, and abstracted related code