add queries? helper to CJ format
code improvements