--- loncom/interface/lonpickcourse.pm	2013/02/05 16:38:00	1.104
+++ loncom/interface/lonpickcourse.pm	2013/02/05 17:02:40	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.104 2013/02/05 16:38:00 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.105 2013/02/05 17:02:40 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -133,8 +133,7 @@ sub handler {
         $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }
-    $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
-              '</script>');
+    $r->print(&Apache::lonhtmlcommon::scripttag($jscript));
     $r->print($submitopener);
 
 # ------------------------------------------ Display of filters to limit search
@@ -645,7 +644,7 @@ sub build_filters {
     } else {
         $typeselectform =  '<select name="type" size="1"';
         if ($onchange) {
-            $typeselectform .= 'onchange="'.$onchange.'"';
+            $typeselectform .= ' onchange="'.$onchange.'"';
         }
         $typeselectform .= '>'."\n";
         foreach my $posstype ('Course','Community') {
@@ -800,7 +799,7 @@ $typeelement
             $output .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
         }
     }
-    $output .= '<input type="hidden" name="updater" value="">'."\n".
+    $output .= '<input type="hidden" name="updater" value="" />'."\n".
                '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
     return $jscript.$warning.$output;
@@ -1012,7 +1011,6 @@ sub gochoose_javascript {
                               },
                     );
     my $output .= qq|
-<script type="text/javascript">
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
     courseCount = 0;
@@ -1098,9 +1096,8 @@ ENDNAMECODE
     $autosubmit
     $lastaction
 }
-</script>
 |;
-    return $output;
+    return &Apache::lonhtmlcommon::scripttag($output);
 }
 
 1;