add client id and billing id filter