CLSN-1488 BillAdhocBuilder.cs Query Change