updated billing queries