--- loncom/interface/lonprintout.pm	2016/08/10 16:06:03	1.650
+++ loncom/interface/lonprintout.pm	2017/01/29 16:02:29	1.653
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.650 2016/08/10 16:06:03 raeburn Exp $
+# $Id: lonprintout.pm,v 1.653 2017/01/29 16:02:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2743,7 +2743,7 @@ ENDPART
 	    $cleanURL=$currentURL;
 	}
 	$selectionmade = 1;
-      
+
 	if ($cleanURL!~m|^/adm/|
 	    && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
 	    my $rndseed=time;
@@ -2956,6 +2956,7 @@ ENDPART
 	    my $texversion='';
 	    if ($urlp!~m|^/adm/|
 		&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+                my $extension = $1;
 		$resources_printed .= $urlp.':';
 		&Apache::lonxml::remember_problem_counter();
 		if ($flag_latex_header_remove eq 'NO') {
@@ -2964,7 +2965,7 @@ ENDPART
                             (($i==0) &&
                              (($urlp=~/\.page$/) ||
                               ($print_type eq 'map_problems_in_page') ||
-                              ($print_type eq 'map_resources_in_page')))) {
+                              (($print_type eq 'map_resources_in_page') && ($extension !~ /^x?html?$/))))) {
                         $flag_latex_header_remove = 'YES';
                     }
 		}
@@ -3447,7 +3448,11 @@ ENDPART
 	$URLback=$helper->{'VARS'}->{'filename'};
     } elsif ($helper->{VARS}{'symb'}) {
         my ($map, $id, $url) = &Apache::lonnet::decode_symb($helper->{VARS}{'symb'});
-        $URLback = &Apache::lonnet::clutter($url);
+        $url = &Apache::lonnet::clutter($url);
+        if ($env{'request.enc'}) {
+            $url = &Apache::lonenc::encrypted($url); 
+        }
+        $URLback = $url.($url =~ /\?/) ? '&':'?''.?symb='.$helper->{VARS}{'symb'};
     }
     #
     # Final adjustment of the font size: