--- gnomemusic.org/playlists.py
+++ gnomemusic/playlists.py
@@ -162,7 +162,7 @@
             return
 
         # For each song run 'add song to playlist'
-        while cursor.next():
+        while cursor.next(None):
             uri = cursor.get_string(0)[0]
             final_query += Query.add_song_to_playlist(playlist.ID, uri)
 
@@ -193,7 +193,7 @@
         cursor = self.tracker.query(
             Query.get_playlist_with_urn(playlist_urn),
             None)
-        if not cursor or not cursor.next():
+        if not cursor or not cursor.next(None):
             return
         return cursor.get_integer(0)
 
@@ -205,7 +205,7 @@
 
         def query_callback(conn, res, data):
             cursor = conn.query_finish(res)
-            if not cursor or not cursor.next():
+            if not cursor or not cursor.next(None):
                 return
             playlist_id = cursor.get_integer(0)
             grilo.get_playlist_with_id(playlist_id, get_callback)
@@ -241,7 +241,7 @@
 
         def query_callback(conn, res, data):
             cursor = conn.query_finish(res)
-            if not cursor or not cursor.next():
+            if not cursor or not cursor.next(None):
                 return
             entry_id = cursor.get_integer(0)
             grilo.get_playlist_song_with_id(
--- gnomemusic.org/query.py
+++ gnomemusic/query.py
@@ -43,9 +43,9 @@
     DOWNLOAD_URI = None
     try:
         music_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
-        MUSIC_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder))
+        MUSIC_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(music_folder,None))
         download_folder = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_DOWNLOAD)
-        DOWNLOAD_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder))
+        DOWNLOAD_URI = Tracker.sparql_escape_string(GLib.filename_to_uri(download_folder,None))
 
         for folder in [music_folder, download_folder]:
             if os.path.islink(folder):