Minor modification on cli-basic-query.py