include address type and remove empty street address lines