Fix for main cli allowing passing arguments with spaces (esp. important for ScanDatabase)