diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
index e96ab14d..dba38613 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
@@ -91,6 +91,9 @@
             </column>
             <column name="error_message" type="${varchar_type}" />
         </createTable>
+        <createIndex tableName="podcast_episode" indexName="idx_podcast_episode_url">
+            <column name="url"/>
+        </createIndex>
         <rollback>
             <dropTable tableName="podcast_episode" />
         </rollback>
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
index 603c06ea..045d5ccb 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
@@ -206,6 +206,9 @@
         <createIndex tableName="album" indexName="idx_album_present" >
             <column name="present"/>
         </createIndex>
+        <createIndex tableName="album" indexName="idx_album_name">
+            <column name="name"/>
+        </createIndex>
         <sql dbms="hsql">
             set table album type cached
         </sql>
@@ -213,16 +216,6 @@
             <dropTable tableName="album" />
         </rollback>
     </changeSet>
-    <changeSet id="schema47_005" author="muff1nman">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <indexExists indexName="idx_album_name" />
-            </not>
-        </preConditions>
-        <createIndex tableName="album" indexName="idx_album_name">
-            <column name="name"/>
-        </createIndex>
-    </changeSet>
     <changeSet id="schema47_006" author="muff1nman">
         <preConditions onFail="MARK_RAN">
             <not>
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml b/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
index 1a9f1a23..ab1e6fc5 100644
--- a/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
+++ b/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
@@ -15,16 +15,6 @@
             </delete>
         </rollback>
     </changeSet>
-    <changeSet id="schema53_002" author="muff1nman">
-        <preConditions onFail="MARK_RAN">
-            <not>
-                <indexExists indexName="idx_podcast_episode_url" />
-            </not>
-        </preConditions>
-        <createIndex tableName="podcast_episode" indexName="idx_podcast_episode_url">
-            <column name="url"/>
-        </createIndex>
-    </changeSet>
     <changeSet id="schema53_003" author="muff1nman">
         <preConditions onFail="MARK_RAN">
             <not>