Add support for CJ queries

:-)
Sure. Way nicer ;-)