diff --git a/src/library/features/libraryfolder/libraryfoldermodel.cpp b/src/library/features/libraryfolder/libraryfoldermodel.cpp
index 1a3462d0d3d1..bd2931d48e4b 100644
--- a/src/library/features/libraryfolder/libraryfoldermodel.cpp
+++ b/src/library/features/libraryfolder/libraryfoldermodel.cpp
@@ -96,11 +96,12 @@ void LibraryFolderModel::createTracksTree() {
                        "FROM track_locations INNER JOIN library ON %3=%4 "
                        "WHERE %2=0 AND %1 LIKE :dir "
                        "GROUP BY %1 "
-                       "ORDER BY %1 COLLATE localeAwareCompare";
+                       "ORDER BY ";
     queryStr = queryStr.arg(TRACKLOCATIONSTABLE_DIRECTORY,
                             "library." + LIBRARYTABLE_MIXXXDELETED,
                             "library." + LIBRARYTABLE_ID,
                             "track_locations." + TRACKLOCATIONSTABLE_ID);
+    queryStr += DbConnection::collateLexicographically(TRACKLOCATIONSTABLE_DIRECTORY);
 
     QSqlQuery query(m_pTrackCollection->database());
     query.prepare(queryStr);
diff --git a/src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp b/src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp
index a62b2f6a076d..9ff36d827e82 100644
--- a/src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp
+++ b/src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp
@@ -9,6 +9,7 @@
 #include "widget/wpixmapstore.h"
 
 #include "library/features/mixxxlibrary/mixxxlibrarytreemodel.h"
+#include "util/db/dbconnection.h"
 
 namespace  {
 // This is used since MixxxLibraryTreeModel inherits QAbstractItemModel
@@ -211,7 +212,7 @@ void MixxxLibraryTreeModel::createTracksTree() {
     QStringList sortColumns;
 #ifdef __SQLITE3__
     for (const QString& col : m_sortOrder) {
-        sortColumns << col + " COLLATE localeAwareCompare";
+        sortColumns << DbConnection::collateLexicographically(col);
     }
 #else
     sortColumns = m_sortOrder;
diff --git a/src/library/features/playlist/playlistfeature.cpp b/src/library/features/playlist/playlistfeature.cpp
index 05069ed7e03d..3d85b86a44d8 100644
--- a/src/library/features/playlist/playlistfeature.cpp
+++ b/src/library/features/playlist/playlistfeature.cpp
@@ -180,14 +180,7 @@ void PlaylistFeature::buildPlaylistList() {
         LOG_FAILED_QUERY(query);
     }
 
-    // Setup the sidebar playlist model
-    QSqlTableModel playlistTableModel(this, m_pTrackCollection->database());
-    playlistTableModel.setTable("PlaylistsCountsDurations");
-    playlistTableModel.select();
-    while (playlistTableModel.canFetchMore()) {
-        playlistTableModel.fetchMore();
-    }
-    QSqlRecord record = playlistTableModel.record();
+    QSqlRecord record = query.record();
     int nameColumn = record.indexOf("name");
     int idColumn = record.indexOf("id");
     int countColumn = record.indexOf("count");