Add way to disable NSD

And fix names with spaces encoded