diff --git a/bin/06_migrationsstatus_treeview.bat b/bin/06_migrationsstatus_treeview.bat
index 7812dfd..a7edc15 100644
--- a/bin/06_migrationsstatus_treeview.bat
+++ b/bin/06_migrationsstatus_treeview.bat
@@ -1,5 +1,5 @@
 @echo off
 :start
 set /p "id=Baugruppennummer: "
-CALL 04_compare_lists.bat --sivasid %id% -t
+CALL 04_compare_lists.bat --sivasid "%id%" -t
 goto start
diff --git a/lib/update_database.py b/lib/update_database.py
index 907d117..179364a 100644
--- a/lib/update_database.py
+++ b/lib/update_database.py
@@ -71,7 +71,7 @@ def get_sivas_dbase(sivas_id, out_dir):
         
         if os.path.isdir(out_dir):
             print(f"Attempting to generate a json-file of all parts to be migrated in relation with '{sivas_id}'")
-            subprocess.run(f"{sivas_exe_path} -o {out_dir} --format json -number {sivas_id}")
+            subprocess.run(f'{sivas_exe_path} -o {out_dir} --format json -number "{sivas_id}"')
             
             if os.path.isfile(os.path.join(out_dir, sivas_id + ".json")):
                 print("done")