diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java
index d3f28b692e..069a2ddfe6 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java
@@ -129,7 +129,7 @@ public Stream<ExecutionStatus> getQueriesFiltered(DatasetId datasetId, UriBuilde
 						 )
 						 .filter(q -> subject.isPermitted(q, Ability.READ))
 						 .map(mq -> {
-							 final OverviewExecutionStatus status = mq.buildStatusOverview(uriBuilder.clone(), subject);
+							 final OverviewExecutionStatus status = mq.buildStatusOverview(subject);
 
 							 if (mq.isReadyToDownload()) {
 								 status.setResultUrls(getResultAssets(config.getResultProviders(), mq, uriBuilder, allProviders));
diff --git a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java
index 6abb5725f5..ee9be78e84 100644
--- a/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java
+++ b/backend/src/main/java/com/bakdata/conquery/apiv1/query/concept/filter/FilterValue.java
@@ -85,22 +85,45 @@ public Condition convertForTableExport(SqlIdColumns ids, ConversionContext conte
 
 	@NoArgsConstructor
 	@CPSType(id = FrontendFilterType.Fields.MULTI_SELECT, base = FilterValue.class)
-	@ToString(callSuper = true)
 	public static class CQMultiSelectFilter extends FilterValue<Set<String>> {
 		public CQMultiSelectFilter(@NsIdRef Filter<Set<String>> filter, Set<String> value) {
 			super(filter, value);
 		}
 
+		@Override
+		public String toString() {
+			final String valueString;
+			if (getValue().size() > 20) {
+				valueString = getValue().size() + " values";
+			}
+			else {
+				valueString = getValue().toString();
+			}
+
+			return "%s(value=%s)".formatted(FrontendFilterType.Fields.BIG_MULTI_SELECT, valueString);
+		}
+
 	}
 
 	@NoArgsConstructor
 	@CPSType(id = FrontendFilterType.Fields.BIG_MULTI_SELECT, base = FilterValue.class)
-	@ToString(callSuper = true)
 	public static class CQBigMultiSelectFilter extends FilterValue<Set<String>> {
 		public CQBigMultiSelectFilter(@NsIdRef Filter<Set<String>> filter, Set<String> value) {
 			super(filter, value);
 		}
 
+		@Override
+		public String toString() {
+			final String valueString;
+			if (getValue().size() > 20) {
+				valueString = getValue().size() + " values";
+			}
+			else {
+				valueString = getValue().toString();
+			}
+
+			return "%s(value=%s)".formatted(FrontendFilterType.Fields.BIG_MULTI_SELECT, valueString);
+		}
 	}
 
 	@NoArgsConstructor
@@ -219,11 +242,10 @@ public GroupFilterValue deserialize(JsonParser p, DeserializationContext ctxt) t
 			final Filter<?> filter = nsIdDeserializer.deserialize(filterTraverse, ctxt);
 
 			if (!(filter instanceof GroupFilter)) {
-				throw InvalidTypeIdException.from(filterNode.traverse(), GroupFilter.class, String.format("Expected filter of type %s but was: %s", GroupFilter.class,
-																										  filter != null
-																										  ? filter.getClass()
-																										  : null
-				));
+				throw InvalidTypeIdException.from(filterNode.traverse(),
+												  GroupFilter.class,
+												  String.format("Expected filter of type %s but was: %s", GroupFilter.class, filter != null ? filter.getClass() : null)
+				);
 			}
 			GroupFilter groupFilter = (GroupFilter) filter;
 
diff --git a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java
index baeaca2288..55dafbee3b 100644
--- a/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java
+++ b/backend/src/main/java/com/bakdata/conquery/models/execution/ManagedExecution.java
@@ -51,7 +51,6 @@
 import com.fasterxml.jackson.annotation.OptBoolean;
 import com.google.common.base.Preconditions;
 import jakarta.validation.constraints.NotNull;
-import jakarta.ws.rs.core.UriBuilder;
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -289,7 +288,7 @@ public void start() {
 	/**
 	 * Renders a lightweight status with meta information about this query. Computation an size should be small for this.
 	 */
-	public OverviewExecutionStatus buildStatusOverview(UriBuilder url, Subject subject) {
+	public OverviewExecutionStatus buildStatusOverview(Subject subject) {
 		OverviewExecutionStatus status = new OverviewExecutionStatus();
 		setStatusBase(subject, status);
 
diff --git a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java
index 0f8039d7a3..ef315cf67e 100644
--- a/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java
+++ b/backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminResource.java
@@ -9,6 +9,7 @@
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.UUID;
+import java.util.stream.Stream;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -21,6 +22,7 @@
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriBuilder;
 
+import com.bakdata.conquery.apiv1.execution.ExecutionStatus;
 import com.bakdata.conquery.apiv1.execution.FullExecutionStatus;
 import com.bakdata.conquery.io.jersey.ExtraMimeTypes;
 import com.bakdata.conquery.io.storage.MetaStorage;
@@ -78,9 +80,7 @@ public Response cancelJob(@PathParam(JOB_ID) UUID jobId) {
 			info.send(new CancelJobMessage(jobId));
 		}
 
-		return Response
-				.seeOther(UriBuilder.fromPath("/admin/").path(AdminUIResource.class, "getJobs").build())
-				.build();
+		return Response.seeOther(UriBuilder.fromPath("/admin/").path(AdminUIResource.class, "getJobs").build()).build();
 	}
 
 	@GET
@@ -97,7 +97,7 @@ public boolean isBusy() {
 
 	@GET
 	@Path("/queries")
-	public FullExecutionStatus[] getQueries(@Auth Subject currentUser, @QueryParam("limit") OptionalLong maybeLimit, @QueryParam("since") Optional<String> maybeSince) {
+	public Stream<ExecutionStatus> getQueries(@Auth Subject currentUser, @QueryParam("limit") OptionalLong maybeLimit, @QueryParam("since") Optional<String> maybeSince) {
 
 		final LocalDate since = maybeSince.map(LocalDate::parse).orElse(LocalDate.now());
 		final long limit = maybeLimit.orElse(100);
@@ -105,13 +105,18 @@ public FullExecutionStatus[] getQueries(@Auth Subject currentUser, @QueryParam("
 		final MetaStorage storage = processor.getStorage();
 
 
-		return storage.getAllExecutions().stream()
+		return storage.getAllExecutions()
+					  .stream()
 					  .filter(t -> t.getCreationTime().toLocalDate().isAfter(since) || t.getCreationTime().toLocalDate().isEqual(since))
 					  .limit(limit)
 					  .map(t -> {
-						  Namespace namespace = processor.getDatasetRegistry().get(t.getDataset().getId());
 						  try {
-							  return t.buildStatusFull(currentUser, namespace);
+							  if (t.isInitialized()) {
+								  final Namespace namespace = processor.getDatasetRegistry().get(t.getDataset().getId());
+								  return t.buildStatusFull(currentUser, namespace);
+							  }
+
+							  return t.buildStatusOverview(currentUser);
 						  }
 						  catch (ConqueryError e) {
 							  // Initialization of execution probably failed, so we construct a status based on the overview status
@@ -121,8 +126,7 @@ public FullExecutionStatus[] getQueries(@Auth Subject currentUser, @QueryParam("
 							  fullExecutionStatus.setError(e);
 							  return fullExecutionStatus;
 						  }
-					  })
-					  .toArray(FullExecutionStatus[]::new);
+					  });
 	}
 
 	@POST
diff --git a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl
index 032b5ed33a..165918873a 100644
--- a/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl
+++ b/backend/src/main/resources/com/bakdata/conquery/resources/admin/ui/queries.html.ftl
@@ -1,255 +1,272 @@
-<#import "templates/template.html.ftl" as layout>
+<#import "templates/template.html.ftl" as layout />
 <@layout.layout>
-	<style>
-		.title {
-			font-size: 18px;
-			font-family: arial, sans-serif;
-		}
-		
-		.inner {
-			font-size: 12px;
-			color: grey;
-		}
+    <style>
+        .title {
+            font-size: 18px;
+            font-family: arial, sans-serif;
+        }
 
-		.innerBtn {
-			font-size: 12px;
-		}
+        .inner {
+            font-size: 12px;
+            color: grey;
+        }
 
-		.btn {
-			padding: 5px 5px;
-		}
+        .innerBtn {
+            font-size: 12px;
+        }
 
-		.progress {
-			margin: 2px;
-		}
+        .btn {
+            padding: 5px 5px;
+        }
 
-		.container {
-			padding: 3px;
-		}
-	</style>
-	<script type="text/javascript">
-	var QueryCounter = 0;
-	var runningQueriesTable = {};
-	var notStartedQueriesTable = {};
-	var failedQueriesTable = {};
-	var succeedQueriesTable = {};
-	var runningNbrElt = {};
-	var notStartedNbrElt = {};
-	var failedNbrElt = {};
-	var succeedNbrElt = {};
-	var reloader = {};
-	var languageTag = {};
-	window.onload = (event) => {
-		languageTag = navigator.language || navigator.userLanguage;
-		handleUpdateCheck(document.getElementById("updateCheckBox"));
-		runningQueriesTable = document.getElementById("runningQueriesTable");
-		notStartedQueriesTable = document.getElementById("notStartedQueriesTable");
-		failedQueriesTable = document.getElementById("failedQueriesTable");
-		succeedQueriesTable = document.getElementById("succeedQueriesTable");
-		runningNbrElt = document.getElementById("runningNbr");
-		notStartedNbrElt = document.getElementById("notStartedNbr");
-		failedNbrElt = document.getElementById("failedNbr");
-		succeedNbrElt = document.getElementById("succeedNbr");
-	}
+        .progress {
+            margin: 2px;
+        }
 
-	function updateQueriesTable(queries) {
-		clearTables();
-		QueryCounter = 0;
-		updateQueriesInnerCounter(queries);
-		if (!queries) return;
-		queries.sort(compareQueriesDate);
-		for (i = 0; i < queries.length; i++) {
-			QueryCounter++;
-			if (queries[i].status === "RUNNING")
-				runningQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
-			if (queries[i].status === "NEW")
-				notStartedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
-			if (queries[i].status === "FAILED")
-				failedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
-			if (queries[i].status === "DONE")
-				succeedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
-		}
-	}
+        .container {
+            padding: 3px;
+        }
+    </style>
+    <script type="text/javascript">
+        var QueryCounter = 0;
+        var runningQueriesTable = {};
+        var notStartedQueriesTable = {};
+        var failedQueriesTable = {};
+        var succeedQueriesTable = {};
+        var runningNbrElt = {};
+        var notStartedNbrElt = {};
+        var failedNbrElt = {};
+        var succeedNbrElt = {};
+        var reloader = {};
+        var languageTag = {};
 
-	function compareQueriesDate(query1, query2) {
-		let createdAt1 = new Date(query1.createdAt);
-		let createdAt2 = new Date(query2.createdAt);
-		let date1Null = createdAt1 == null || createdAt1 == undefined;
-		let date2Null = createdAt2 == null || createdAt2 == undefined;
-		if (date1Null && date2Null) return 0;
-		else if (date2Null || createdAt1 > createdAt2) return 1;
-		else if (date1Null || createdAt1 < createdAt2) return -1;
-		else return 0;
-	}
+        window.onload = (event) => {
+            languageTag = navigator.language || navigator.userLanguage;
 
-	function updateQueriesInnerCounter(queries) {
-		if (!queries) return;
-		runningNbrElt.innerText = queries.filter(x => x.status === "RUNNING").length;
-		notStartedNbrElt.innerText = queries.filter(x => x.status === "NEW").length;
-		failedNbrElt.innerText = queries.filter(x => x.status === "FAILED").length;
-		succeedNbrElt.innerText = queries.filter(x => x.status === "DONE").length;
-	}
+            runningQueriesTable = document.getElementById("runningQueriesTable");
+            notStartedQueriesTable = document.getElementById("notStartedQueriesTable");
+            failedQueriesTable = document.getElementById("failedQueriesTable");
+            succeedQueriesTable = document.getElementById("succeedQueriesTable");
+            runningNbrElt = document.getElementById("runningNbr");
+            notStartedNbrElt = document.getElementById("notStartedNbr");
+            failedNbrElt = document.getElementById("failedNbr");
+            succeedNbrElt = document.getElementById("succeedNbr");
 
-	function clearTables() {
-		runningQueriesTable.innerHTML = "";
-		failedQueriesTable.innerHTML = "";
-		succeedQueriesTable.innerHTML = "";
-		notStartedQueriesTable.innerHTML = "";
-	}
+            handleUpdateCheck(document.getElementById("updateCheckBox"));
+        }
 
-	function getQueries() {
-		try {
-			rest(
-					'/admin/queries', {
-						method: 'get',
-					}).then(response => response.json()).then(queries => {
-					updateQueriesTable(queries);
-				})
-				.catch(error => {
-					console.log(error);
-				});
-		} catch (error) {
-			console.log(error);
-			return null;
-		};
-	}
+        function updateQueriesTable(queries) {
+            clearTables();
+            QueryCounter = 0;
+            updateQueriesInnerCounter(queries);
+            if (!queries) return;
+            queries.sort(compareQueriesDate);
+            for (i = 0; i < queries.length; i++) {
+                QueryCounter++;
+                if (queries[i].status === "RUNNING")
+                    runningQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
+                if (queries[i].status === "NEW")
+                    notStartedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
+                if (queries[i].status === "FAILED")
+                    failedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
+                if (queries[i].status === "DONE")
+                    succeedQueriesTable.insertAdjacentHTML('beforeend', getHtmltemplate(queries[i], QueryCounter));
+            }
+        }
 
-	function handleUpdateCheck(event) {
-		if (event.checked) {
-			reloader = setInterval(getQueries, 5000);
-			return;
-		}
-		clearInterval(reloader);
-		reloader = 0;
-	}
+        function compareQueriesDate(query1, query2) {
+            let createdAt1 = new Date(query1.createdAt);
+            let createdAt2 = new Date(query2.createdAt);
+            let date1Null = createdAt1 == null || createdAt1 == undefined;
+            let date2Null = createdAt2 == null || createdAt2 == undefined;
+            if (date1Null && date2Null) return 0;
+            else if (date2Null || createdAt1 > createdAt2) return 1;
+            else if (date1Null || createdAt1 < createdAt2) return -1;
+            else return 0;
+        }
+
+        function updateQueriesInnerCounter(queries) {
+            if (!queries) return;
+            runningNbrElt.innerText = queries.filter(x => x.status === "RUNNING").length;
+            notStartedNbrElt.innerText = queries.filter(x => x.status === "NEW").length;
+            failedNbrElt.innerText = queries.filter(x => x.status === "FAILED").length;
+            succeedNbrElt.innerText = queries.filter(x => x.status === "DONE").length;
+        }
+
+        function clearTables() {
+            runningQueriesTable.innerHTML = "";
+            failedQueriesTable.innerHTML = "";
+            succeedQueriesTable.innerHTML = "";
+            notStartedQueriesTable.innerHTML = "";
+        }
+
+        function getQueries() {
+            try {
+                rest('/admin/queries', {
+                    method: 'get',
+                }).then(response => response.json()).then(queries => {
+                    updateQueriesTable(queries);
+                })
+                    .catch(error => {
+                        console.log(error);
+                    });
+            } catch (error) {
+                console.log(error);
+                return null;
+            };
+        }
+
+        // Initial load
+        getQueries();
+
+        function handleUpdateCheck(event) {
+            if (event.checked) {
+                reloader = setInterval(getQueries, 5000);
+                return;
+            }
+            clearInterval(reloader);
+            reloader = 0;
+        }
 	<#noparse >
 		function getHtmltemplate(data, queryCounter) {
-			return `
-					<div class="row container" >
-						<div class="card container">
-							<div class="card-body">
-								<div class="row">
-									<div class="col title">
-										${data.label} ( ${data.ownerName} , ${data.id.split('.')[0]} ) : ${data.id.split('.')[1]}
-									</div>
-								</div>
-								<div class="row container">
-									<div class="col inner">
-										Creation-Time : ${((new Date(data.createdAt)).toLocaleString(languageTag))}
-									</div>
-									<div class="col inner">
-										Start-Time : ${((new Date(data.startTime)).toLocaleString(languageTag))}
-									</div>
-									<div class="col inner">
-										Finish-Time : ${((new Date(data.finishTime)).toLocaleString(languageTag))}
-									</div>
-								</div>
-								<div class="row container">
-									<div class="col inner">
-										Requested-Time : ${data.requiredTime} ms
-									</div>
-									<div class="col inner">
-										Query-Type : ${data.queryType}
-									</div>
-									<div class="col">
-										<button class="btn btn-primary innerBtn" type="button" data-toggle="collapse" data-target="#query${queryCounter}" aria-expanded="false" aria-controls="query${queryCounter}" ${(data.query ? '' : 'disabled')}>
-										Show query content
-										</button>
-										<button class="btn btn-primary innerBtn" type="button" data-toggle="collapse" data-target="#error${queryCounter}" aria-expanded="false" aria-controls="error${queryCounter}" ${(data.error ? '' : 'disabled')}>
-										Show errors
-										</button>
-									</div>
-								</div>
-								<div class="row container" ${(data.progress && data.progress != null ? "" : "style=\"display: none;\"" )}>
-								<div class="col">
-									<div class="progress">
-										<div class="progress-bar ${(data.status === "RUNNING" ? "bg-warning" : (data.status === "FAILED" ? "bg-danger" : (data.status === "DONE" ? "bg-success" : "") ))}" role="progressbar" style="width: ${(data.progress && data.progress != null ? data.progress*100 : 0 )}%" aria-valuenow="${(data.progress && data.progress != null ? data.progress*100 : 0 )}" aria-valuemin="0" aria-valuemax="100">
-										${(data.progress && data.progress != null ? data.progress*100 : 0 )} %
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="row container">
-							<div class="col">
-								<div class="collapse multi-collapse" id="query${queryCounter}">
-									<div class="card card-body">
-										<pre>  ${(data.query ? JSON.stringify(data.query, undefined, 2) : '')}  </pre>
-									</div>
-								</div>
-							</div>
-							<div class="col">
-								<div class="collapse multi-collapse" id="error${queryCounter}">
-									<div class="card card-body">
-										<pre>  ${(data.error ? JSON.stringify(data.error, undefined, 2) : '')}  </pre>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-					</div>
-					</div>
-			`
+			return `<div class="row container">
+    <div class="card container">
+        <div class="card-body">
+            <div class="row">
+                <div class="col title">
+                    ${data.id}: ${data.label} - ${data.ownerName}
+                </div>
+            </div>
+            <div class="row container">
+                <div class="col inner">
+                    Creation: ${((new Date(data.createdAt)).toLocaleString(languageTag))}
+                </div>
+                <div class="col inner">
+                    Started: ${((new Date(data.startTime)).toLocaleString(languageTag))}
+                </div>
+                <div class="col inner">
+                    Finished: ${((new Date(data.finishTime)).toLocaleString(languageTag))}
+                </div>
+            </div>
+            <div class="row container">
+                <div class="col inner">
+                    Duration: ${data.requiredTime}ms
+                </div>
+                <div class="col inner">
+                    Type: ${data.queryType}
+                </div>
+                <div class="col">
+                    <button class="btn btn-primary innerBtn" type="button" data-toggle="collapse"
+                        data-target="#query${queryCounter}" aria-expanded="false" aria-controls="query${queryCounter}"
+                        <#if (!data.query??)>disabled</#if>>
+                        Show query content
+                    </button>
+                    <button class="btn btn-primary innerBtn" type="button" data-toggle="collapse"
+                        data-target="#error${queryCounter}" aria-expanded="false" aria-controls="error${queryCounter}"
+                        <#if (!data.error??)>disabled</#if>>
+                        Show errors
+                    </button>
+                </div>
+            </div>
+            <div class="row container" <#if (!data.progress ??) > style="display: none;"</#if >>
+            <div class="col">
+                <div class="progress">
+                    <div class="progress-bar <#if data.status==" RUNNING">bg-warning<# /if><#if data.status=="FAILED">bg-danger<# /if><#if data.status=="DONE">bg-success<# /if>"
+                    role="progressbar"
+                    style="width: <#if data.progress??>${data.progress * 100}%</#if>"
+                    aria-valuenow="<#if data.progress??>${data.progress * 100}%</#if>"
+                    aria-valuemin="0" aria - valuemax="100" >
+                    <#if data.progress??> ${ data.progress * 100 }%</#if >
+                    </div >
+                </div >
+                </div >
+            </div >
+            <div class="row container">
+                <div class="col">
+                    <div class="collapse multi-collapse" id="query${queryCounter}">
+                        <div class="card card-body">
+                            <pre><#if data.query??>${JSON.stringify(data.query, undefined, 2)}</#if></pre>
+                        </div>
+                    </div>
+                </div>
+                <div class="col">
+                    <div class="collapse multi-collapse" id="error${queryCounter}">
+                        <div class="card card-body">
+                            <pre><#if data.error??>${JSON.stringify(data.error, undefined, 2)}</#if></pre>
+                        </div>
+                    </div>
+                </div >
+            </div >
+        </div >
+    </div >
+</div >
+`
 		}
 	</#noparse>
-	</script>
-	<h1>Queries</h1>
-	<label><input id="updateCheckBox" type='checkbox' onclick='handleUpdateCheck(this);' checked> Update automatically.</label>
-	<div id="accordion">
-		<div class="card">
-			<div class="card-header" id="headingOne">
-				<h5 class="mb-0">
-					<button class="btn btn-link" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-						Running <span class="badge badge-warning" id="runningNbr">0</span>
-					</button>
-				</h5>
-			</div>
-			<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
-				<div class="card-body">
-					<div id="runningQueriesTable" class="container main"></div>
-				</div>
-			</div>
-		</div>
-		<div class="card">
-			<div class="card-header" id="headingTwo">
-				<h5 class="mb-0">
-					<button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-						Failed <span class="badge badge-danger" id="failedNbr">0</span>
-					</button>
-				</h5>
-			</div>
-			<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion">
-				<div class="card-body">
-					<div id="failedQueriesTable" class="container main"></div>
-				</div>
-			</div>
-		</div>
-		<div class="card">
-			<div class="card-header" id="headingThree">
-				<h5 class="mb-0">
-					<button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
-						Succeed <span class="badge badge-success" id="succeedNbr">0</span>
-					</button>
-				</h5>
-			</div>
-			<div id="collapseThree" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
-				<div class="card-body">
-					<div id="succeedQueriesTable" class="container main"></div>
-				</div>
-			</div>
-		</div>
-		<div class="card">
-			<div class="card-header" id="headingFour">
-				<h5 class="mb-0">
-					<button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
-						Not started <span class="badge badge-light" id="notStartedNbr">0</span>
-					</button>
-				</h5>
-			</div>
-			<div id="collapseFour" class="collapse" aria-labelledby="headingFour" data-parent="#accordion">
-				<div class="card-body">
-					<div id="notStartedQueriesTable" class="container main"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-</@layout.layout>
\ No newline at end of file
+    </script>
+    <h1>Queries</h1>
+    <label><input id="updateCheckBox" type='checkbox' onclick='handleUpdateCheck(this);' checked> Update
+        automatically.</label>
+    <div id="accordion">
+        <div class="card">
+            <div class="card-header" id="headingOne">
+                <h5 class="mb-0">
+                    <button class="btn btn-link" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true"
+                        aria-controls="collapseOne">
+                        Running <span class="badge badge-warning" id="runningNbr">0</span>
+                    </button>
+                </h5>
+            </div>
+            <div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion">
+                <div class="card-body">
+                    <div id="runningQueriesTable" class="container main"></div>
+                </div>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-header" id="headingTwo">
+                <h5 class="mb-0">
+                    <button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseTwo"
+                        aria-expanded="false" aria-controls="collapseTwo">
+                        Failed <span class="badge badge-danger" id="failedNbr">0</span>
+                    </button>
+                </h5>
+            </div>
+            <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion">
+                <div class="card-body">
+                    <div id="failedQueriesTable" class="container main"></div>
+                </div>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-header" id="headingThree">
+                <h5 class="mb-0">
+                    <button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseThree"
+                        aria-expanded="false" aria-controls="collapseThree">
+                        Succeed <span class="badge badge-success" id="succeedNbr">0</span>
+                    </button>
+                </h5>
+            </div>
+            <div id="collapseThree" class="collapse" aria-labelledby="headingThree" data-parent="#accordion">
+                <div class="card-body">
+                    <div id="succeedQueriesTable" class="container main"></div>
+                </div>
+            </div>
+        </div>
+        <div class="card">
+            <div class="card-header" id="headingFour">
+                <h5 class="mb-0">
+                    <button class="btn btn-link collapsed" data-toggle="collapse" data-target="#collapseFour"
+                        aria-expanded="false" aria-controls="collapseFour">
+                        Not started <span class="badge badge-light" id="notStartedNbr">0</span>
+                    </button>
+                </h5>
+            </div>
+            <div id="collapseFour" class="collapse" aria-labelledby="headingFour" data-parent="#accordion">
+                <div class="card-body">
+                    <div id="notStartedQueriesTable" class="container main"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</@layout.layout>