Improvement for addresses without proper name