diff --git a/OsmAnd/res/layout/favourite_edit_dialog.xml b/OsmAnd/res/layout/favourite_edit_dialog.xml
index 11614f7abf..d2fcd8c292 100644
--- a/OsmAnd/res/layout/favourite_edit_dialog.xml
+++ b/OsmAnd/res/layout/favourite_edit_dialog.xml
@@ -6,12 +6,12 @@
   	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
   			android:text="@string/favourites_edit_dialog_name"/>
   	<EditText android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  			android:id="@+id/Name"/>
+  			android:id="@+id/Name" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
   </TableRow>
   <TableRow>
   	<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" 
   			android:text="@string/favourites_edit_dialog_category"/>
   	<AutoCompleteTextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingLeft="3dp"
-  		android:id="@+id/Category" android:completionThreshold="1"/>
+  		android:id="@+id/Category" android:completionThreshold="1" android:inputType="textCapWords" android:selectAllOnFocus="true"/>
   </TableRow>
 </TableLayout>
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 0862268e4b..7062ee095c 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -81,7 +81,10 @@ public class FavouritesDbHelper extends SQLiteOpenHelper {
 				WptPt pt = new WptPt();
 				pt.lat = p.getLatitude();
 				pt.lon = p.getLongitude();
-				pt.name = p.getName() + "_" + p.getCategory();
+				if (p.getCategory().length() > 0)
+					pt.name = p.getName() + "_" + p.getCategory();
+				else
+					pt.name = p.getName();
 				gpx.points.add(pt);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java b/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
index 626b29e5b0..11cb10975e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavouritesActivity.java
@@ -406,7 +406,7 @@ public class FavouritesActivity extends OsmandExpandableListActivity {
 						}
 						for(WptPt p : res.points){
 							if(!existedPoints.contains(p.name)){
-								String categoryName = FavouritesActivity.this.getString(R.string.favorite_default_category);
+								String categoryName = "";
 								int c;
 								String name = p.name;
 								if(name == null){
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index 8df5b4e340..484dbcb890 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -112,6 +112,7 @@ public class MapActivityActions implements DialogProvider {
 				resources.getString(R.string.favorite_default_category));
 		args.putSerializable(KEY_FAVORITE, point);
 		final EditText editText =  (EditText) dialog.findViewById(R.id.Name);
+		editText.requestFocus();
 		editText.setText(point.getName());
 		final AutoCompleteTextView cat =  (AutoCompleteTextView) dialog.findViewById(R.id.Category);
 		cat.setText(point.getCategory());