--- loncom/xml/scripttag.pm	2015/04/06 16:27:12	1.174
+++ loncom/xml/scripttag.pm	2016/07/01 19:59:25	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.174 2015/04/06 16:27:12 raeburn Exp $
+# $Id: scripttag.pm,v 1.175 2016/07/01 19:59:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -364,7 +364,7 @@ sub start_scriptlib {
     $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').
 	&Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
-            &Apache::edit::browse(undef,'textnode').
+            &Apache::edit::browse_or_search(undef,'textnode').
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
@@ -616,9 +616,11 @@ sub start_import {
     my $location=$token->[1];
     $location=~s/^\s*//s;
     $location=~s/\s*$//s;
+    my $crsonly = join(',',(&Apache::loncommon::filecategorytypes('Problem'),
+                            &Apache::loncommon::filecategorytypes('Library')));
     $result.=&Apache::edit::editline($location,$bodytext,'',40);
-    $result.=&Apache::edit::browse(undef,'textnode');
-    $result.= '&nbsp;<label>'.&mt('Import as:').
+    $result.=&Apache::edit::browse_or_search(undef,'textnode',undef,undef,$crsonly);
+    $result.= '&nbsp;<span class="LC_nobreak"><label>'.&mt('Import as:').
               '<select name="importmode_'.$Apache::lonxml::curdepth.'">';
     my %options=&Apache::lonlocal::texthash(''        => 'as standard library',
                                             'problem' => 'as problem',
@@ -630,7 +632,7 @@ sub start_import {
        }
        $result.='>'.$options{$option}.'</option>';
     }
-    $result.='</select></label>';
+    $result.='</select></label></span>';
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"