--- rat/lonpageflip.pm	2021/08/09 18:51:04	1.109
+++ rat/lonpageflip.pm	2021/12/31 19:51:04	1.111
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.109 2021/08/09 18:51:04 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.111 2021/12/31 19:51:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -126,7 +126,7 @@ sub move {
 	}
         $deeplinkonly = 0;
         if ($hash{'deeplinkonly_'.$next}) {
-            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next});
+            my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$next});
             my ($state,$others,$listed,$scope,$protect) = split(/,/,$value);
             unless (($state eq 'both') || ($hash{'is_map_'.$next})) {
                 if ($level eq 'resource') {
@@ -160,7 +160,7 @@ sub move {
                 }
             }
         } elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) {
-            my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev});
+            my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$prev});
             my ($state,$others,$listed,$scope,$protect) = split(/,/,$value);
             unless (($state eq 'both') || ($hash{'is_map_'.$prev})) {
                 if ($level eq 'resource') {
@@ -690,7 +690,8 @@ sub handler {
                       my $mapid = $hash{'map_pc_'.&Apache::lonnet::clutter($map)};
                       my $position_deeplink = $hash{'deeplinkonly_'.$mapid.'.'.$resid};
                       if ($position_deeplink) {
-                          (my $value,$deeplinklevel) = split(/:/,$position_deeplink);
+                          (my $value,$deeplinklevel) = map { &unescape($_); } 
+                                                       split(/:/,$position_deeplink);
                       }
                   }
               }
@@ -835,8 +836,8 @@ ENDSTART
                           }
                       }
 		  }
-                  unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') ||
-                          ($env{'request.role.adv'})) {
+                  unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') &&
+                          (!$env{'request.role.adv'})) {
                       if ($deeplinklevel) {
                           $r->print(
                               &Apache::lonhtmlcommon::actionbox(