diff --git a/zxdb.py b/zxdb.py
index 147b920..f9b4de7 100644
--- a/zxdb.py
+++ b/zxdb.py
@@ -84,8 +84,8 @@ def select(cursor, query_index=0):
     # Procesar los resultados
     for row in cursor:
         element = {
-            "title": row[0],
-            "developer": row[1],
+            "title": unidecode(row[0]),
+            "developer": unidecode(row[1]),
             "release_year": row[2],
             "url": row[3],
             "filetype": row[4],
@@ -213,7 +213,7 @@ def get_final_destination_folder(developer, year, root_folder):
     # Carpeta basada en el desarrollador
     folder2 = ""
     if should_sort_by_developer:
-        developer = unidecode(developer or "")
+        developer = developer or ""
         folder2 = os.path.join(developer[0].upper(), developer)
 
     # Carpeta basada en el año de lanzamiento