--- loncom/interface/lonnavmaps.pm	2020/03/05 16:45:36	1.549
+++ loncom/interface/lonnavmaps.pm	2021/04/29 17:45:22	1.551
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.549 2020/03/05 16:45:36 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.551 2021/04/29 17:45:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1940,7 +1940,7 @@ END
             if ($env{'request.course.id'}) {
                 if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }
@@ -1948,7 +1948,7 @@ END
                         $srcHasQuestion = 1;
                     }
                 } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }
@@ -4021,7 +4021,8 @@ sub next {
     # That ends the main iterator logic. Now, do we want to recurse
     # down this map (if this resource is a map)?
     if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
-        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
+        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION}) &&
+        ($env{'request.role.adv'} || !$self->{HERE}->randomout())) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
         my $finishResource = $self->{HERE}->map_finish();