Move billingaddress to custom parameters, fix empty name