diff --git a/MacPass/Kdb4Entry+MPAdditions.m b/MacPass/Kdb4Entry+MPAdditions.m
index 57bfc47e..d42631ba 100644
--- a/MacPass/Kdb4Entry+MPAdditions.m
+++ b/MacPass/Kdb4Entry+MPAdditions.m
@@ -14,7 +14,12 @@
   /*
    FIXME: Introduce some cachin behaviour. We iterate over after every single edit
    */
-  NSMutableSet *keys = [[NSMutableSet alloc] initWithCapacity:[self.stringFields count]];
+  NSArray *defaultKeys = @[ FIELD_TITLE,
+                            FIELD_USER_NAME,
+                            FIELD_PASSWORD,
+                            FIELD_URL,
+                            FIELD_NOTES ];
+  NSMutableSet *keys = [[NSMutableSet alloc] initWithArray:defaultKeys];
   for(StringField *field in self.stringFields) {
     [keys addObject:field.key];
   }
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 7b575736..b0bb4851 100644
Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 6b350ee4..670f0205 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ