diff --git a/core/Changes b/core/Changes
index a659a88..68eb797 100644
--- a/core/Changes
+++ b/core/Changes
@@ -9,6 +9,8 @@
    - Updated KoralNode and enforced order of RewriteTask (margaretha)
 14/09/2018
    - Added a status code for nonunique results (margaretha)
+29/10/2018
+    - Added javax.servlet-api
     
 version 0.61.1
 28/08/2018
diff --git a/core/pom.xml b/core/pom.xml
index abf0580..11d8560 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -285,7 +285,7 @@
 		<dependency>
 			<groupId>de.ids_mannheim.korap</groupId>
 			<artifactId>Krill</artifactId>
-			<version>0.58.0</version>
+			<version>0.58.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.xerial</groupId>
@@ -365,9 +365,6 @@
 			<version>${spring-framework.version}</version>
 		</dependency>
 
-		<!-- <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache-core</artifactId> 
-			<version>2.6.5</version> </dependency> -->
-
 		<!-- end copy -->
 
 		<dependency>
@@ -454,7 +451,10 @@
 			<artifactId>hibernate-ehcache</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>4.0.1</version>
+		</dependency>
 	</dependencies>
-
-
 </project>
diff --git a/full/Changes b/full/Changes
index bd4de8a..5d23f15 100644
--- a/full/Changes
+++ b/full/Changes
@@ -13,6 +13,8 @@
     - Added "highlights" parameter to matchInfo controller (margaretha)
     - Added "fields" parameter to search controllers (margaretha)
     - Integrated lite controllers, services and tests in full version (margaretha)
+29/10/2018
+    - Moved javax.servlet-api to core
 
 # version 0.61.2
 12/09/2018
diff --git a/full/pom.xml b/full/pom.xml
index 24f2108..0f20e87 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -328,12 +328,6 @@
 			<version>1.1.1</version>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>4.0.1</version>
-		</dependency>
-
 		<!-- Flyway -->
 		<dependency>
 			<groupId>org.flywaydb</groupId>
diff --git a/full/src/main/java/de/ids_mannheim/korap/oauth2/oltu/service/OltuTokenService.java b/full/src/main/java/de/ids_mannheim/korap/oauth2/oltu/service/OltuTokenService.java
index fb7b541..591e41d 100644
--- a/full/src/main/java/de/ids_mannheim/korap/oauth2/oltu/service/OltuTokenService.java
+++ b/full/src/main/java/de/ids_mannheim/korap/oauth2/oltu/service/OltuTokenService.java
@@ -86,6 +86,8 @@
      * Client authentication is done using the given client
      * credentials.
      * 
+     * TODO: should create a new refresh token when the old refresh token is used
+     * 
      * @param refreshTokenStr
      * @param scopes
      * @param clientId
@@ -188,6 +190,8 @@
      * authenticate, client_id is made required (similar to
      * authorization code grant).
      * 
+     * TODO: FORCE client secret
+     * 
      * @param clientId
      *            client_id, required
      * @param clientSecret
diff --git a/lite/Changes b/lite/Changes
index 40e0a11..180dcab 100644
--- a/lite/Changes
+++ b/lite/Changes
@@ -1,6 +1,8 @@
 version 0.61.1
 22/10/2018
    - Updated spring and kustvakt-core versions (margaretha)
+29/10/2018
+   - Added rewrite handler post construct (margaretha)
 
 version 0.61.0
 30/08/2018
diff --git a/lite/pom.xml b/lite/pom.xml
index 02b9699..8bf87ce 100644
--- a/lite/pom.xml
+++ b/lite/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.ids_mannheim.korap</groupId>
 	<artifactId>Kustvakt-lite</artifactId>
-	<version>0.61.0</version>
+	<version>0.61.1</version>
 	<properties>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/lite/src/main/java/de/ids_mannheim/korap/web/service/lite/LiteService.java b/lite/src/main/java/de/ids_mannheim/korap/web/service/lite/LiteService.java
index d268617..3873773 100644
--- a/lite/src/main/java/de/ids_mannheim/korap/web/service/lite/LiteService.java
+++ b/lite/src/main/java/de/ids_mannheim/korap/web/service/lite/LiteService.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -78,7 +79,11 @@
         this.graphDBhandler = new ClientsHandler(builder.build());
     }
 
-
+    @PostConstruct
+    private void init () {
+        processor.defaultRewriteConstraints();
+    }
+    
     /** Requires Karang (Neo4j search engine)
      *  
      * @param query