CLSN 2167 : fixed billing queries