Updated command-line to handle special characters