improve CLI to express more query + query debugger option