diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..50362cbf334e1bd24b9fd9491b51ded56ffa0014
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,36 @@
+
+version: '3'
+
+networks:
+
+    esap_net:
+
+services:
+    esap_api:
+        image:
+           "esap_api:latest"
+        read_only:
+            false
+        volumes:
+            - /data/shared:/shared
+        networks:
+            - esap_net
+        ports:
+            - "8005:8005"
+
+    my_nginx:
+        image:
+           "my_nginx:latest"
+        read_only:
+            false
+        volumes:
+            - /data/shared:/shared
+            - /data/shared:/etc/nginx/conf.d/
+            - /data/shared/static:/static
+        networks:
+            - esap_net
+        ports:
+            - "80:80"
+        depends_on:
+            - esap_api
+
diff --git a/src/routes/query/QueryArchives.js b/src/routes/query/QueryArchives.js
index 78c74431c62a342b83e361745855deca520234f7..a8ef6d85e1324209fe8df28094c89473b935ada5 100644
--- a/src/routes/query/QueryArchives.js
+++ b/src/routes/query/QueryArchives.js
@@ -100,6 +100,15 @@ export default function QueryArchives(props) {
             queryToStore[key]=value
         }
 
+         if (formData.keyword) {
+
+            key = "keyword"
+            value = formData.keyword.trim()
+
+            query = query + "&" + key + "=" + value
+            queryToStore[key]=value
+        }
+
 
         if (formData.target) {
 
@@ -342,4 +351,4 @@ export default function QueryArchives(props) {
     );
 
 
-}
\ No newline at end of file
+}