diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2
index 15bfb8db..98ddb732 100644
--- a/app/templates/_scripts.html.j2
+++ b/app/templates/_scripts.html.j2
@@ -26,15 +26,6 @@
   output='gen/app.%(version)s.js',
   'js/App.js',
   'js/Utils.js',
-  'js/CorpusAnalysis/CorpusAnalysisApp.js',
-  'js/CorpusAnalysis/CorpusAnalysisConcordance.js',
-  'js/CorpusAnalysis/CorpusAnalysisReader.js',
-  'js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js',
-  'js/CorpusAnalysis/QueryBuilder.js',
-  'js/CorpusAnalysis/QueryBuilder/ElementReferencesQueryBuilder.js',
-  'js/CorpusAnalysis/QueryBuilder/GeneralFunctionsQueryBuilder.js',
-  'js/CorpusAnalysis/QueryBuilder/StructuralAttributeBuilderFunctionsQueryBuilder.js',
-  'js/CorpusAnalysis/QueryBuilder/TokenAttributeBuilderFunctionsQueryBuilder.js',
   'js/XMLtoObject.js'
 %}
 <script src="{{ ASSET_URL }}"></script>
@@ -96,6 +87,21 @@
 %}
 <script src="{{ ASSET_URL }}"></script>
 {%- endassets %}
+{%- assets
+  filters='rjsmin',
+  output='gen/CorpusAnalysis.%(version)s.js',
+  'js/CorpusAnalysis/QueryBuilder/ElementReferencesQueryBuilder.js',
+  'js/CorpusAnalysis/QueryBuilder/GeneralFunctionsQueryBuilder.js',
+  'js/CorpusAnalysis/QueryBuilder/StructuralAttributeBuilderFunctionsQueryBuilder.js',
+  'js/CorpusAnalysis/QueryBuilder/TokenAttributeBuilderFunctionsQueryBuilder.js',
+  'js/CorpusAnalysis/CorpusAnalysisApp.js',
+  'js/CorpusAnalysis/CorpusAnalysisConcordance.js',
+  'js/CorpusAnalysis/QueryBuilder.js',
+  'js/CorpusAnalysis/CorpusAnalysisReader.js',
+  'js/CorpusAnalysis/CorpusAnalysisStaticVisualization.js'
+%}
+<script src="{{ ASSET_URL }}"></script>
+{%- endassets %}
 <script>
   const app = new App();
   {%- if current_user.is_authenticated %}