--- loncom/interface/londocs.pm	2014/11/25 04:32:13	1.588
+++ loncom/interface/londocs.pm	2014/12/20 20:32:33	1.590
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.588 2014/11/25 04:32:13 raeburn Exp $
+# $Id: londocs.pm,v 1.590 2014/12/20 20:32:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1191,10 +1191,14 @@ sub print_paste_buffer {
                     $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
                     $icon .= '/navmap.folder.closed.gif';
                 }
+                my $title = $env{'docs.markedcopy_title_'.$suffix};
+                if ($title eq '') {
+                    ($title) = ($url =~ m{/([^/]+)$});
+                }
                 $buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'.
                           ': '.
                           &Apache::loncommon::parse_supplemental_title(
-                             &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}));
+                             &LONCAPA::map::qtescape($title));
             }
             $pasteitems .= '<div class="LC_left_float">';
             my ($options,$onclick);
@@ -5834,6 +5838,7 @@ sub editing_js {
             if (&Apache::lonnet::is_on_map($res)) {
                 $backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='.
                              &HTML::Entities::encode($caller,'<>&"');
+                $backtourl = &Apache::loncommon::escape_single($backtourl);
             } else {
                 $backtourl = '/adm/navmaps';
             }