adding a bunch of billing-related queries
Finishing storage billing query