Fixed bugs and improve AddressService