diff --git a/config/alfresco/mimetype/mimetype-map.xml b/config/alfresco/mimetype/mimetype-map.xml
index 7a8cd8fb19..14a2f8bf2d 100644
--- a/config/alfresco/mimetype/mimetype-map.xml
+++ b/config/alfresco/mimetype/mimetype-map.xml
@@ -145,6 +145,7 @@
             <extension display="DTD">dtd</extension>
             <extension display="XSLT">xslt</extension>
             <extension display="XSLT">xsl</extension>
+            <extension display="XSD">xsd</extension>
          </mimetype>
          <mimetype mimetype="application/x-dvi" display="">
             <extension>dvi</extension>
diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index f4e53d4626..7354e6c5a9 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -296,7 +296,7 @@ public class Search extends BaseScopableProcessorExtension
     
     public Scriptable luceneSearch(String store, String search, String sortColumn, boolean asc)
     {
-       return luceneSearch(null, search, sortColumn, asc, 0);
+       return luceneSearch(store, search, sortColumn, asc, 0);
     }
     
     /**