diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index c32e6ac..c5e035c 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-2019
\ No newline at end of file
+2021
\ No newline at end of file
diff --git a/FLocal.Patcher.Common/FLocal.Patcher.Common.csproj b/FLocal.Patcher.Common/FLocal.Patcher.Common.csproj
index dbc773f..3c429df 100644
--- a/FLocal.Patcher.Common/FLocal.Patcher.Common.csproj
+++ b/FLocal.Patcher.Common/FLocal.Patcher.Common.csproj
@@ -67,6 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\Patch_00000_cleaninstall.xml" />
+    <EmbeddedResource Include="Resources\Patch_00001_threadsindexes.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/FLocal.Patcher.Common/Resources/Patch_00001_threadsindexes.xml b/FLocal.Patcher.Common/Resources/Patch_00001_threadsindexes.xml
new file mode 100644
index 0000000..45a28a5
--- /dev/null
+++ b/FLocal.Patcher.Common/Resources/Patch_00001_threadsindexes.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<patch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="..\..\Patcher\Resources\IPatch.xsd">
+	<version>
+		<number>1</number>
+		<author>threadsindexes</author>
+	</version>
+	<strictCommandSet>
+		<command>
+			<sql>
+				<installSql>
+					<query>DROP INDEX "Threads_FirstPostId_idx"</query>
+					<query>CREATE INDEX "Threads_FirstPostId_idx" on "Threads"("FirstPostId" asc)</query>
+				</installSql>
+				<uninstallSql/>
+			</sql>
+		</command>
+		<command>
+			<sql>
+				<installSql>
+					<query>DROP INDEX "Threads_LastPostId_idx"</query>
+					<query>CREATE INDEX "Threads_LastPostId_idx" on "Threads"("LastPostId" desc)</query>
+				</installSql>
+				<uninstallSql/>
+			</sql>
+		</command>
+		<command>
+			<sql>
+				<installSql>
+					<query>DROP INDEX "Threads_IsAnnouncement_LastPostId_idx"</query>
+					<query>CREATE INDEX "Threads_IsAnnouncement_LastPostId_idx" on "Threads"("IsAnnouncement" desc, "LastPostId" desc)</query>
+				</installSql>
+				<uninstallSql/>
+			</sql>
+		</command>
+	</strictCommandSet>
+</patch>