diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp
index c946c947..b3394b14 100644
--- a/src/libs/database/impl/Session.cpp
+++ b/src/libs/database/impl/Session.cpp
@@ -258,24 +258,18 @@ namespace lms::db
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_date_idx ON track(date)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_directory_release_idx ON track(directory_id, release_id);");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_added_idx ON track(file_added)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_added_desc_idx ON track(file_added DESC)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_last_write_desc_idx ON track(file_last_write DESC)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_media_library_idx ON track(media_library_id)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_media_library_release_idx ON track(media_library_id, release_id)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_mbid_idx ON track(mbid)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_name_idx ON track(name)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_name_file_size_idx ON track(name, file_size)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_name_nocase_idx ON track(name COLLATE NOCASE)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_original_date_idx ON track(original_date)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_recording_mbid_idx ON track(recording_mbid)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_disc_idx ON track(release_id, disc_number)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_date_idx ON track(release_id, date)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_date_desc_idx ON track(release_id, date DESC)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_last_write_idx ON track(release_id, file_last_write)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_last_write_desc_idx ON track(release_id, file_last_write DESC)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_added_idx ON track(release_id, file_added)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_added_desc_idx ON track(release_id, file_added DESC)");
 
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_id_idx ON tracklist(id)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)");
diff --git a/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp b/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
index 1944bc2d..d0d30e44 100644
--- a/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
+++ b/src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp
@@ -384,6 +384,7 @@ namespace lms::scanner
             db::Track::FindParameters params;
             // Add as many fields as possible to limit errors
             params.setName(parsedTrack.title);
+            params.setFileSize(fileSize);
             if (parsedTrack.medium)
             {
                 if (parsedTrack.medium->position)
@@ -393,7 +394,6 @@ namespace lms::scanner
             }
             if (parsedTrack.position)
                 params.setTrackNumber(*parsedTrack.position);
-            params.setFileSize(fileSize);
 
             bool error{};
             db::Track::pointer res;
diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
index e589fa2a..8aa5c93a 100644
--- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
+++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
@@ -207,9 +207,9 @@ namespace lms::api::subsonic
         auto transaction{ context.dbSession.createReadTransaction() };
 
         db::Track::FindParameters params;
-        params.name = titleName;
-        params.artistName = artistName;
-        params.range = Range{ 0, 2 };
+        params.setName(titleName);
+        params.setArtistName(artistName);
+        params.setRange(db::Range{ .offset = 0, .size = 2 });
 
         // Choice: we return nothing if there are too many results
         const auto tracks{ db::Track::findIds(context.dbSession, params) };