Add support for CJ queries

:-)
I see… I misunderstood what the `options` where for. I'll also check all the other comments below. Thanks!