Fixed wrong array reference in default country assignment
Fixed todo in getAddressOptions()