fix cli input query
Merge branch 'hotfix/fix-cli-input-query'