(COMMIT-48) AddressDao bug fixes