diff --git a/hetu-docs/en/admin/web-interface.md b/hetu-docs/en/admin/web-interface.md
index 288e994cc..d0e9aca31 100644
--- a/hetu-docs/en/admin/web-interface.md
+++ b/hetu-docs/en/admin/web-interface.md
@@ -34,3 +34,31 @@ and statistics about the query is available by clicking the *JSON* link. These v
 > -   **Default value:** `false`
 >
 > Insecure authentication over HTTP is disabled by default. This could be overridden via "hetu.queryeditor-ui.allow-insecure-over-http" property of "etc/config.properties" (e.g. hetu.queryeditor-ui.allow-insecure-over-http=true).
+
+### `hetu.queryeditor-ui.execution-timeout`
+
+> -   **Type:** `duration`
+> -   **Default value:** `1 DAYS`>
+>
+> UI Execution timeout is set to 1 day as default. This could be overridden via "hetu.queryeditor-ui.execution-timeout" of "etc/config.properties"
+
+### `hetu.queryeditor-ui.max-result-count`
+
+> - **Type:** `int`
+> - **Default value:** `1000`
+>
+> UI max result count is set to 1000 as default. This could be overridden via "hetu.queryeditor-ui.max-result-count" of "etc/config.properties"
+
+### `hetu.queryeditor-ui.max-result-size-mb`
+
+>- **Type:** `size`
+>- **Default value:** `1GB`
+>
+> UI max result size is set to 1 GB as default. This could be overridden via "hetu.queryeditor-ui.max-result-size-mb" of "etc/config.properties"
+
+### `hetu.queryeditor-ui.session-timeout`
+
+> -   **Type:** `duration`
+> -   **Default value:** `1 DAYS`
+>
+> UI session timeout is set to 1 day as default. This could be overridden via "hetu.queryeditor-ui.session-timeout" of "etc/config.properties"
\ No newline at end of file
diff --git a/presto-main/src/main/java/io/prestosql/queryeditorui/QueryEditorConfig.java b/presto-main/src/main/java/io/prestosql/queryeditorui/QueryEditorConfig.java
index 3b60b6a03..5ead29369 100644
--- a/presto-main/src/main/java/io/prestosql/queryeditorui/QueryEditorConfig.java
+++ b/presto-main/src/main/java/io/prestosql/queryeditorui/QueryEditorConfig.java
@@ -23,7 +23,6 @@ import javax.validation.constraints.NotNull;
 import java.util.Optional;
 
 import static java.util.concurrent.TimeUnit.DAYS;
-import static java.util.concurrent.TimeUnit.MINUTES;
 
 public class QueryEditorConfig
 {
@@ -36,7 +35,7 @@ public class QueryEditorConfig
     private DataSize maxResultSize = new DataSize(1, DataSize.Unit.GIGABYTE);
     private Optional<String> sharedSecret = Optional.empty();
     private Duration sessionTimeout = new Duration(1, DAYS);
-    private Duration executionTimeout = new Duration(15, MINUTES);
+    private Duration executionTimeout = new Duration(1, DAYS);
 
     public boolean isAllowInsecureOverHttp()
     {