NSM GoogleDrive: id-fix and some code updates