Support quote in command line with minor bug fix