diff --git a/pom.xml b/pom.xml
index cda745c41ebc80c1183da0229b095ad1ec75775b..96b0d026acd8e8ca44a0f1c8bafdb5ac68804bd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
 		<version.selenium>3.13.0</version.selenium>
 		<version.drone>2.5.1</version.drone>
 		<activemq.version>5.15.8</activemq.version>
-		<qtiworks.version>1.0.17</qtiworks.version>
+		<qtiworks.version>1.0.18</qtiworks.version>
 
 	    <!-- properties for testing and Q&A -->
 	    <!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->
diff --git a/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java b/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
index 07e83b08901c1ca2e6ccc21b8a1f0027b913bc78..d7e1cd773b1b2d33584ed3b27fd8c503e92a3c58 100644
--- a/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
+++ b/src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java
@@ -107,7 +107,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
 	
 	private static final OLog log = Tracing.createLoggerFor(QuestionPoolServiceImpl.class);
 	
-	private static final int MAX_NUMBER_DOCS = 990;
+	private static final int MAX_NUMBER_DOCS = 32000;
 	
 	@Autowired
 	private DB dbInstance;
diff --git a/src/main/java/org/olat/search/SearchModule.java b/src/main/java/org/olat/search/SearchModule.java
index 1ece537d8ec58318844033ac5a32bbc92e755f8d..857c3f8ef6d1194f272772bc9dbc879b8de43853 100644
--- a/src/main/java/org/olat/search/SearchModule.java
+++ b/src/main/java/org/olat/search/SearchModule.java
@@ -94,7 +94,7 @@ public class SearchModule extends AbstractSpringModule {
 	private long indexInterval = 0;
 	@Value("${generate.index.at.startup:true}")
 	private boolean generateAtStartup;
-	private int maxHits = 1000;
+	private int maxHits = 32000;
 	private int maxResults = 100;
 
 	@Value("${search.timeout:15}")