diff --git a/MyTracks/res/raw/mytracks_empty_spreadsheet.ods b/MyTracks/res/raw/mytracks_empty_spreadsheet.ods
index 151fb4116..eb7aca654 100644
Binary files a/MyTracks/res/raw/mytracks_empty_spreadsheet.ods and b/MyTracks/res/raw/mytracks_empty_spreadsheet.ods differ
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Constants.java b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
index 0d6a9eff3..371e26333 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Constants.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Constants.java
@@ -124,8 +124,6 @@ public abstract class Constants {
   public static final String
       RESUME_TRACK_EXTRA_NAME = "com.google.android.apps.mytracks.RESUME_TRACK";
 
-  public static final String MAPSHOP_BASE_URL = "https://maps.google.com/maps/ms";
-
   public static final String SETTINGS_NAME = "SettingsActivity";
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteAllTrackDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteAllTrackDialogFragment.java
index d847b6f95..819463108 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteAllTrackDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteAllTrackDialogFragment.java
@@ -33,14 +33,19 @@ import android.support.v4.app.DialogFragment;
 public class DeleteAllTrackDialogFragment extends DialogFragment {
 
   public static final String DELETE_ALL_TRACK_DIALOG_TAG = "deleteAllTrackDialog";
-  
+
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     return DialogUtils.createConfirmationDialog(getActivity(),
         R.string.track_list_delete_all_confirm_message, new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
-            MyTracksProviderUtils.Factory.get(getActivity()).deleteAllTracks();
+            new Thread(new Runnable() {
+              @Override
+              public void run() {
+                MyTracksProviderUtils.Factory.get(getActivity()).deleteAllTracks();
+              }
+            }).start();
           }
         });
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneMarkerDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneMarkerDialogFragment.java
index f21d25d74..3f196f35b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneMarkerDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneMarkerDialogFragment.java
@@ -56,8 +56,14 @@ public class DeleteOneMarkerDialogFragment extends DialogFragment {
         R.string.marker_delete_one_marker_confirm_message, new DialogInterface.OnClickListener() {
           @Override
           public void onClick(DialogInterface dialog, int which) {
-            MyTracksProviderUtils.Factory.get(getActivity()).deleteWaypoint(
-                getArguments().getLong(KEY_MARKER_ID), new DescriptionGeneratorImpl(getActivity()));
+            new Thread(new Runnable() {
+              @Override
+              public void run() {
+                MyTracksProviderUtils.Factory.get(getActivity()).deleteWaypoint(
+                    getArguments().getLong(KEY_MARKER_ID),
+                    new DescriptionGeneratorImpl(getActivity()));
+              }
+            }).start();
             Intent intent = IntentUtils.newIntent(getActivity(), MarkerListActivity.class)
                 .putExtra(MarkerListActivity.EXTRA_TRACK_ID, getArguments().getLong(KEY_TRACK_ID));
             startActivity(intent);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java
index a3d223f00..7dee67e80 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneTrackDialogFragment.java
@@ -79,13 +79,18 @@ public class DeleteOneTrackDialogFragment extends DialogFragment {
         R.string.track_detail_delete_confirm_message, new DialogInterface.OnClickListener() {
             @Override
           public void onClick(DialogInterface dialog, int which) {
-            long trackId = getArguments().getLong(KEY_TRACK_ID);
-            Context context = getActivity();
+            final long trackId = getArguments().getLong(KEY_TRACK_ID);
+            final Context context = getActivity();
             if (trackId == PreferencesUtils.getLong(context, R.string.recording_track_id_key)) {
               TrackRecordingServiceConnectionUtils.stop(
                   context, caller.getTrackRecordingServiceConnection(), false);
             }
-            MyTracksProviderUtils.Factory.get(context).deleteTrack(trackId);
+            new Thread(new Runnable() {
+              @Override
+              public void run() {
+                MyTracksProviderUtils.Factory.get(context).deleteTrack(trackId);
+              }
+            }).start();
             Intent intent = IntentUtils.newIntent(context, TrackListActivity.class);
             startActivity(intent);
             // Close the activity since its content can change after delete
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
index 042b3b09c..7c98c7643 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsAsyncTask.java
@@ -38,6 +38,8 @@ import android.content.Context;
 import android.util.Log;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 
 /**
  * AsyncTask to send a track to Google Docs.
@@ -127,6 +129,13 @@ public class SendDocsAsyncTask extends AbstractSendAsyncTask {
     if (track.getCategory() != null && !track.getCategory().equals("")) {
       title += "-" + track.getCategory();
     }
+    try {
+      title = URLEncoder.encode(title, "UTF-8");
+      title = title.replace('+', ' ');
+    } catch (UnsupportedEncodingException e) {
+      Log.d(TAG, "No UTF-8 encoding", e);
+      return false;
+    }
 
     // Get the spreadsheet ID
     publishProgress(PROGRESS_GET_SPREADSHEET_ID);
@@ -259,7 +268,8 @@ public class SendDocsAsyncTask extends AbstractSendAsyncTask {
       return false;
     }
     try {
-      spreadsheetId = SendDocsUtils.createSpreadsheet(spreadsheetTitle, documentsAuthToken, context);
+      spreadsheetId = SendDocsUtils.createSpreadsheet(
+          spreadsheetTitle, documentsAuthToken, context);
     } catch (IOException e) {
       Log.d(TAG, "Unable to create spreadsheet", e);
       return false;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java
index 87cd2e6e4..906798471 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java
@@ -15,11 +15,12 @@
  */
 package com.google.android.apps.mytracks.io.docs;
 
-import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesUtils;
 import com.google.android.apps.mytracks.io.gdata.docs.DocumentsClient;
 import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient;
 import com.google.android.apps.mytracks.io.gdata.docs.SpreadsheetsClient.WorksheetEntry;
+import com.google.android.apps.mytracks.io.maps.SendMapsUtils;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.PreferencesUtils;
 import com.google.android.apps.mytracks.util.ResourceUtils;
@@ -311,10 +312,17 @@ public class SendDocsUtils {
     appendTag(builder, "maxelevation", getElevation(stats.getMaxElevation(), metricUnits));
     appendTag(builder, "elevationunit", elevationUnit);
 
-    if (track.getMapId().length() > 0) {
-      appendTag(builder, "map", String.format(
-          Locale.US, "%s?msa=0&msid=%s", Constants.MAPSHOP_BASE_URL, track.getMapId()));
+    String map = SendMapsUtils.getMapUrl(track); 
+    if (map == null) {
+      map = context.getString(R.string.value_unknown);
     }
+    appendTag(builder, "map", map);
+
+    String fusionTable = SendFusionTablesUtils.getMapUrl(track);
+    if (fusionTable == null) {
+      fusionTable = context.getString(R.string.value_unknown);
+    }
+    appendTag(builder, "fusiontable", fusionTable);
 
     builder.append("</entry>");
     return builder.toString();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
index cf2958ce7..ef128be09 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java
@@ -277,9 +277,8 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
         distances.add(tripStatisticsBuilder.getStatistics().getTotalDistance());
         elevations.add(elevationBuffer.getAverage());
         DescriptionGenerator descriptionGenerator = new DescriptionGeneratorImpl(context);
-        track.setDescription("<p>" + track.getDescription() + "</p><p>"
-            + descriptionGenerator.generateTrackDescription(track, distances, elevations, true)
-            + "</p>");
+        track.setDescription(
+            descriptionGenerator.generateTrackDescription(track, distances, elevations, true));
         String name = context.getString(R.string.marker_label_end, track.getName());
         if (!createNewPoint(name, track.getDescription(), lastLocation, MARKER_TYPE_END)) {
           Log.d(TAG, "Unable to create the end marker");
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java
index 909d3b56d..3a4c2c596 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesUtils.java
@@ -52,7 +52,10 @@ public class SendFusionTablesUtils {
    * @return the url.
    */
   public static String getMapUrl(Track track) {
-    if (track == null || track.getTripStatistics() == null || track.getTableId() == null) {
+    if (track == null 
+        || track.getTripStatistics() == null 
+        || track.getTableId() == null
+        || track.getTableId().length() == 0) {
       Log.e(TAG, "Invalid track");
       return null;
     }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java
index a1ff28f36..9a9ee09c7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsUtils.java
@@ -54,11 +54,12 @@ public class SendMapsUtils {
    * @return the url if available.
    */
   public static String getMapUrl(Track track) {
-    if (track == null || track.getMapId() == null) {
+    if (track == null 
+        || track.getMapId() == null 
+        || track.getMapId().length() == 0) {
       Log.e(TAG, "Invalid track");
       return null;
     }
-
     return MapsClient.buildMapUrl(track.getMapId());
   }