diff --git a/beets.config.yaml b/beets.config.yaml
index fea5f51..d2ce7e2 100644
--- a/beets.config.yaml
+++ b/beets.config.yaml
@@ -24,13 +24,12 @@ replace:
   '(?<!^)[-_]$': ''
 
 per_disc_numbering: yes
-
 item_fields:
-    multidisc: 1 if disctotal > 1 else 0
+  multidisc: disctotal > 1
 
 paths:
   default: $albumartist/$album%aunique{}/%if{$multidisc,${disc}_}_${track}_-_${title}
-  singleton: $artist/etc/title
+  singleton: $artist/etc/$title
   comp: various_artists/$album%aunique{}/%if{$multidisc,${disc}_}_${track}_-_${title}
 
 va_name: various artists
@@ -38,7 +37,11 @@ va_name: various artists
 languages: ["nl", "en"]
 bell: yes
 
-plugins: edit inline the types fetchart lyrics lastgenre mpdupdate badfiles acousticbrainz
+plugins: edit inline the types fetchart lyrics mpdupdate badfiles acousticbrainz
+
+edit:
+  itemfields: track disc title artist album mb_trackid
+  albumfields: album albumartist disctotal year country mb_albumid
 
 mpd:
   host: localhost
@@ -57,3 +60,5 @@ the:
 
 types:
   rating: float
+
+# vim: set ft=yaml et sw=2 ts=2 :