diff --git a/.travis.yml b/.travis.yml
index 60e475b0b..8f258d324 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ jobs:
       script:
         - (cd web && npm run build:prod)
           && mvn clean install -q -f lib -DskipTests -Dmaven.javadoc.skip=true
-          && mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip=true
+          && mvn clean install -q -f rest -DskipTests -Dmaven.javadoc.skip=true -P history.plugin
     - stage: "Release / Deploy"
       name: "Release stage"
       script:
diff --git a/ci/test.sh b/ci/test.sh
index bf08f647a..2524b592c 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -29,8 +29,7 @@ function main {
   if [[ "$1" == "H2" ]]; then
     (cd $REL/../web && npm run test)
     mvn clean verify -q -f $REL/../lib/ -B
-    mvn clean install -q -f $REL/../rest/ -B
-    mvn clean verify -q -f $REL/../rest/ -B -pl taskana-rest-spring-example -P history.plugin 
+    mvn clean install -q -f $REL/../rest/ -B -P history.plugin
   elif [[ "$1" == "POSTGRES_10_4" ]]; then
     mvn clean verify -q -f $REL/../lib/taskana-core -B
     mvn clean install -q -f $REL/../rest/ -B -P postgres
diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml
index d47a633ad..4973ac53d 100644
--- a/rest/taskana-rest-spring-example/pom.xml
+++ b/rest/taskana-rest-spring-example/pom.xml
@@ -28,6 +28,22 @@
 		</repositories>
 	-->
 
+	<profiles>
+		<profile>
+			<id>history.plugin</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>pro.taskana</groupId>
+					<artifactId>taskana-history-rest-spring</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -41,16 +57,6 @@
 			<artifactId>taskana-rest-spring</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>pro.taskana</groupId>
-			<artifactId>taskana-history-rest-spring</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>pro.taskana.simplehistory</groupId>
-			<artifactId>taskana-simplehistory-provider</artifactId>
-			<version>0.0.6</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
diff --git a/rest/taskana-rest-spring-setup/src/main/java/pro/taskana/rest/controllers/ViewController.java b/rest/taskana-rest-spring-setup/src/main/java/pro/taskana/rest/controllers/ViewController.java
index f8c93de9f..5be13c2e5 100644
--- a/rest/taskana-rest-spring-setup/src/main/java/pro/taskana/rest/controllers/ViewController.java
+++ b/rest/taskana-rest-spring-setup/src/main/java/pro/taskana/rest/controllers/ViewController.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 public class ViewController {
 
-    @RequestMapping({"", "/administration*/**", "/workplace*/**", "/monitor*/**", "/no-role*/**"})
+    @RequestMapping({"", "/administration*/**", "/workplace*/**", "/monitor*/**", "/history*/**", "/no-role*/**"})
     public String index() {
         return "forward:/index.html";
     }
diff --git a/web/src/app/history/task-query/task-query.component.html b/web/src/app/history/task-query/task-query.component.html
index f7bcb26e0..2a18bb23c 100644
--- a/web/src/app/history/task-query/task-query.component.html
+++ b/web/src/app/history/task-query/task-query.component.html
@@ -11,7 +11,7 @@
     <h4 class="panel-header">Taskana history query</h4>
   </div>
   <div class="panel-body">
-    <div class="divTable table-striped">
+    <div class="divTable table-striped" *ngIf="taskQuery">
       <form [formGroup]="taskQueryForm">
         <div class="divTableHeading">
           <div class="divTableRow">
diff --git a/web/src/app/history/task-query/task-query.component.ts b/web/src/app/history/task-query/task-query.component.ts
index 6d6170e6f..63b680af5 100644
--- a/web/src/app/history/task-query/task-query.component.ts
+++ b/web/src/app/history/task-query/task-query.component.ts
@@ -170,7 +170,7 @@ export class TaskQueryComponent implements OnInit {
   }
 
   private performRequest() {
-    setTimeout(() => this.requestInProgressService.setRequestInProgress(true), 1)
+    this.requestInProgressService.setRequestInProgress(true);
     this.calculateQueryPages();
     this.taskQuerySubscription = this.taskQueryService.queryTask(
       this.orderBy.sortBy.replace(/([A-Z])|([0-9])/g, (g) => `-${g[0].toLowerCase()}`),
@@ -195,7 +195,7 @@ export class TaskQueryComponent implements OnInit {
       this.taskQueryForm.get('custom3') ? this.taskQueryForm.get('custom3').value : undefined,
       this.taskQueryForm.get('custom4') ? this.taskQueryForm.get('custom4').value : undefined,
       false).subscribe(taskQueryResource => {
-        this.requestInProgressService.setRequestInProgress(false)
+        this.requestInProgressService.setRequestInProgress(false);
         if (!taskQueryResource._embedded) {
           this.taskQuery = null;
           this.taskQueryResource = null;
diff --git a/web/src/app/services/requestInProgress/request-in-progress.service.ts b/web/src/app/services/requestInProgress/request-in-progress.service.ts
index 62f9c7c43..678eefdaf 100644
--- a/web/src/app/services/requestInProgress/request-in-progress.service.ts
+++ b/web/src/app/services/requestInProgress/request-in-progress.service.ts
@@ -9,7 +9,7 @@ export class RequestInProgressService {
 	constructor() { }
 
 	setRequestInProgress(value: boolean) {
-		this.requestInProgressTriggered.next(value);
+		setTimeout(() => this.requestInProgressTriggered.next(value), 0);
 	}
 
 	getRequestInProgress(): Observable<boolean> {