Added fixes for when street name or street number not defined