Add support for CJ queries

:-)
maybe a self link could be used if no explicit action is given?