fixed the number and neighborhood fallbacks in get_payment_xml method