Minor work on claim billing queries