diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
index a408eeb35c..e0f519d9b5 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroups.java
@@ -20,7 +20,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 	
 	private static final String GROUP_NAME = "name";
 	private static final String GROUP_ID = "group_id";
-	private static final String EXPIRE_TIME = "expireTime";
+	private static final String EXPIRE_TIME = "until";
 	private static final String DESCRIPTION = "description";
 	private static final String POLICY = "policy";
 	private static final String USERS = "users";
@@ -137,7 +137,7 @@ public class OsMoGroups implements OsMoReactor, OsmoTrackerListener {
 		boolean processed = false;
 		String operation = command + ":" + gid;
 		OsMoGroup group = null;
-		if(command.equalsIgnoreCase("GROUP_CHANGE")) {
+		if(command.equalsIgnoreCase("GP")) {
 			group = storage.getGroup(gid);
 			if(group != null) {
 				List<OsMoDevice> delta = mergeGroup(group, obj, false);
diff --git a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
index c490647bfb..069d810578 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/SettingsOsMoActivity.java
@@ -1,9 +1,7 @@
 package net.osmand.plus.osmo;
 
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 import net.osmand.access.AccessibleToast;
 import net.osmand.plus.R;