Refactor address lines to use first found instead of leaving blanks