diff --git a/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
index d72716e01..cfc7c9165 100644
--- a/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
@@ -73,7 +73,7 @@ DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
         QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
         foreach( QString s, sl )
         {
-            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkUtils::sqlEscape( s ) );
+            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkSqlQuery::escape( s ) );
         }
 
         filterToken = QString( "AND artist.id = file_join.artist AND file_join.track = track.id %1" ).arg( filtersql );
diff --git a/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp b/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp
index c9479a345..5d030d1ac 100644
--- a/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp
@@ -63,7 +63,7 @@ DatabaseCommand_AllArtists::exec( DatabaseImpl* dbi )
         QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
         foreach( QString s, sl )
         {
-            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkUtils::sqlEscape( s ) );
+            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkSqlQuery::escape( s ) );
         }
 
         filterToken = QString( "AND file_join.track = track.id %1" ).arg( filtersql );
diff --git a/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp
index 0fd08a9bd..38e968bbc 100644
--- a/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp
@@ -81,7 +81,7 @@ DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
             tDebug() << "Deleting" << m_dir.path() << "from db for localsource" << srcid;
             TomahawkSqlQuery dirquery = dbi->newquery();
             QString path( "file://" + m_dir.canonicalPath() + "/%" );
-            dirquery.prepare( QString( "SELECT id FROM file WHERE source IS NULL AND url LIKE '%1'" ).arg( TomahawkUtils::sqlEscape( path ) ) );
+            dirquery.prepare( QString( "SELECT id FROM file WHERE source IS NULL AND url LIKE '%1'" ).arg( TomahawkSqlQuery::escape( path ) ) );
             dirquery.exec();
 
             while ( dirquery.next() )