diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 2edea79b5b..f990e7a88d 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -201,14 +201,6 @@
                 <runtime-relative-path>ext/bcmail-jdk15-1.45.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/bcmail-jdk15-1.45.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-6.2.1-javadoc.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-6.2.1-javadoc.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpmime-4.4.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpmime-4.4.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-parsers-1.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/tika-parsers-1.5.jar</binary-origin>
@@ -221,6 +213,10 @@
                 <runtime-relative-path>ext/org.osgi.compendium-4.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/org.osgi.compendium-4.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-api-1.7.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.7.6.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
@@ -241,6 +237,10 @@
                 <runtime-relative-path>ext/asm-all-3.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/asm-all-3.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/solr-solrj-6.2.1-javadoc.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-6.2.1-javadoc.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-3.10-beta2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-3.10-beta2.jar</binary-origin>
@@ -277,6 +277,10 @@
                 <runtime-relative-path>ext/org.osgi.core-4.0.0.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/org.osgi.core-4.0.0.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpclient-4.4.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpclient-4.4.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/isoparser-1.0-RC-1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/isoparser-1.0-RC-1.jar</binary-origin>
@@ -297,10 +301,6 @@
                 <runtime-relative-path>ext/jericho-html-3.3-javadoc.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jericho-html-3.3-javadoc.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-6.2.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-6.2.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/apache-mime4j-dom-0.7.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/apache-mime4j-dom-0.7.2.jar</binary-origin>
@@ -309,26 +309,14 @@
                 <runtime-relative-path>ext/org.apache.felix.scr.generator-1.1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/solr-solrj-6.2.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-6.2.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/poi-scratchpad-3.10-beta2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/poi-scratchpad-3.10-beta2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.4.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpclient-4.4.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/noggit-0.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/noggit-0.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/solr-solrj-6.2.1-sources.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/solr-solrj-6.2.1-sources.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-io-2.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-io-2.5.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/netcdf-4.2-min.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/netcdf-4.2-min.jar</binary-origin>
@@ -338,13 +326,21 @@
                 <binary-origin>release/modules/ext/vorbis-java-core-0.1-tests.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpcore-4.4.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/httpcore-4.4.1.jar</binary-origin>
+                <runtime-relative-path>ext/commons-io-2.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-io-2.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-codec-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.5.jar</binary-origin>
+            </class-path-extension>            
             <class-path-extension>
                 <runtime-relative-path>ext/jericho-html-3.3-sources.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jericho-html-3.3-sources.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/solr-solrj-6.2.1-sources.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/solr-solrj-6.2.1-sources.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
@@ -354,17 +350,29 @@
                 <binary-origin>release/modules/ext/org.apache.felix.scr.annotations-1.6.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.5.jar</binary-origin>
+                <runtime-relative-path>ext/noggit-0.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/noggit-0.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/apache-mime4j-core-0.7.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/apache-mime4j-core-0.7.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpmime-4.4.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpmime-4.4.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/qdox-1.12.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/qdox-1.12.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/httpcore-4.4.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpcore-4.4.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-validator-1.5.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-validator-1.5.1.jar</binary-origin>
@@ -397,6 +405,10 @@
                 <runtime-relative-path>ext/pdfbox-1.8.4.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/pdfbox-1.8.4.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/wstx-asl-3.2.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/wstx-asl-3.2.7.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/aspectjrt-1.6.11.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/aspectjrt-1.6.11.jar</binary-origin>