Update create/update billing api

1. Fix bug in create/updte billing api