diff --git a/mediarepo-daemon/mediarepo-core/src/settings.rs b/mediarepo-daemon/mediarepo-core/src/settings.rs
index c212b2a..2d72071 100644
--- a/mediarepo-daemon/mediarepo-core/src/settings.rs
+++ b/mediarepo-daemon/mediarepo-core/src/settings.rs
@@ -14,8 +14,8 @@ impl Default for Settings {
         Self {
             listen_address: "127.0.0.1:3425".to_string(),
             database_path: "./db/repo.db".to_string(),
-            default_file_store: "./files".to_string(),
-            thumbnail_store: "./thumb".to_string(),
+            default_file_store: "Main".to_string(),
+            thumbnail_store: "Thumbnails".to_string(),
         }
     }
 }
diff --git a/mediarepo-daemon/src/main.rs b/mediarepo-daemon/src/main.rs
index eface57..1b01a58 100644
--- a/mediarepo-daemon/src/main.rs
+++ b/mediarepo-daemon/src/main.rs
@@ -255,7 +255,9 @@ async fn add_tags_from_tags_file(
             tag_ids.push(tag.id());
         }
         log::info!("Mapping {} tags to the file", tag_ids.len());
-        file.add_tags(tag_ids).await?;
+        if !tag_ids.is_empty() {
+            file.add_tags(tag_ids).await?;
+        }
     } else {
         log::info!("No tags file '{:?}' found", tags_path);
     }
diff --git a/mediarepo-daemon/src/utils.rs b/mediarepo-daemon/src/utils.rs
index 91f5d9d..66c0435 100644
--- a/mediarepo-daemon/src/utils.rs
+++ b/mediarepo-daemon/src/utils.rs
@@ -26,6 +26,10 @@ pub async fn create_paths_for_repo(root: &PathBuf, settings: &Settings) -> RepoR
     if !storage_path.exists() {
         fs::create_dir_all(storage_path).await?;
     }
+    let thumbnail_path = root.join(&settings.thumbnail_store);
+    if !thumbnail_path.exists() {
+        fs::create_dir_all(thumbnail_path).await?;
+    }
 
     Ok(())
 }