Another few improvements on addresses list.