diff --git a/CliClient/app/cli-utils.js b/CliClient/app/cli-utils.js
index 6781dadf8d..783c515b52 100644
--- a/CliClient/app/cli-utils.js
+++ b/CliClient/app/cli-utils.js
@@ -102,6 +102,7 @@ cliUtils.makeCommandArgs = function(cmd, argv) {
 	let args = yargParser(argv, {
 		boolean: booleanFlags,
 		alias: aliases,
+		string: ['_'],
 	});
 
 	for (let i = 1; i < cmdUsage['_'].length; i++) {
diff --git a/CliClient/app/command-ls.js b/CliClient/app/command-ls.js
index daa8d1d47d..4b242ff94d 100644
--- a/CliClient/app/command-ls.js
+++ b/CliClient/app/command-ls.js
@@ -89,7 +89,7 @@ class Command extends BaseCommand {
 						row.push(await Folder.noteCount(item.id));
 					}
 
-					row.push(time.unixMsToLocalDateTime(item.updated_time));
+					row.push(time.unixMsToLocalDateTime(item.user_updated_time));
 				}
 
 				let title = item.title;
diff --git a/CliClient/package.json b/CliClient/package.json
index 6f80dd2130..07f2b8b7b2 100644
--- a/CliClient/package.json
+++ b/CliClient/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/laurent22/joplin"
   },
   "url": "git://github.com/laurent22/joplin.git",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "bin": {
     "joplin": "./main.js"
   },
diff --git a/CliClient/package.json.md5 b/CliClient/package.json.md5
index d10505a735..7dcc136876 100644
--- a/CliClient/package.json.md5
+++ b/CliClient/package.json.md5
@@ -1 +1 @@
-28897a284082f5be431a27ee5b1a26cb
\ No newline at end of file
+6aa2be3698aa3b5cf8e0875bf37c7851
\ No newline at end of file
diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle
index 68e31626ce..6ee8f16ad4 100644
--- a/ReactNativeClient/android/app/build.gradle
+++ b/ReactNativeClient/android/app/build.gradle
@@ -90,8 +90,8 @@ android {
 		applicationId "net.cozic.joplin"
 		minSdkVersion 16
 		targetSdkVersion 22
-		versionCode 44
-		versionName "0.9.31"
+		versionCode 45
+		versionName "0.9.32"
 		ndk {
 			abiFilters "armeabi-v7a", "x86"
 		}
diff --git a/ReactNativeClient/lib/base-model.js b/ReactNativeClient/lib/base-model.js
index 2eed07c77a..ba5f7486b4 100644
--- a/ReactNativeClient/lib/base-model.js
+++ b/ReactNativeClient/lib/base-model.js
@@ -106,7 +106,7 @@ class BaseModel {
 	}
 
 	static shortId(id) {
-		return id.substr(0, 4);
+		return id.substr(0, 5);
 	}
 
 	static loadByPartialId(partialId) {