diff --git a/db_structure.xml b/db_structure.xml
index b124217112..acdd2a5a57 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1541,8 +1541,7 @@
 				<notnull>true</notnull>
 				<length>64</length>
 			</field>
-<!--
-			TODO: finalize indexes when all queries are done
+
 			<index>
 				<name>comments_parent_id_index</name>
 				<unique>false</unique>
@@ -1553,15 +1552,11 @@
 			</index>
 
 			<index>
-				<name>comments_actor_index</name>
+				<name>comments_topmost_parent_id_idx</name>
 				<unique>false</unique>
 				<field>
-					<name>actor_type</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>actor_id</name>
-					<sorting>ascending</sorting>
+					<name>topmost_parent_id</name>
+					<sorting>descending</sorting>
 				</field>
 			</index>
 
@@ -1580,8 +1575,21 @@
 					<name>creation_timestamp</name>
 					<sorting>descending</sorting>
 				</field>
+				<!-- TODO: check whether this supports a query without creation timestamp -->
+			</index>
+
+			<index>
+				<name>comments_actor_index</name>
+				<unique>false</unique>
+				<field>
+					<name>actor_type</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>actor_id</name>
+					<sorting>ascending</sorting>
+				</field>
 			</index>
--->
 
 		</declaration>
 
@@ -1626,6 +1634,29 @@
 				<length>64</length>
 			</field>
 
+			<index>
+				<name>comments_marker_user_id_index</name>
+				<unique>false</unique>
+				<field>
+					<name>user_id</name>
+					<sorting>descending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>comments_marker_object_index</name>
+				<unique>false</unique>
+				<field>
+					<name>object_type</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>object_id</name>
+					<sorting>ascending</sorting>
+				</field>
+				<!-- TODO: check whether this supports a query with user_id -->
+			</index>
+
 		</declaration>
 
 	</table>
diff --git a/version.php b/version.php
index 4ae94717c3..1113196ce3 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 0, 0, 13);
+$OC_Version = array(9, 0, 0, 14);
 
 // The human readable string
 $OC_VersionString = '9.0.0 beta 2';