CLT-131 add -c option to query command as well and fix show_result call