diff --git a/Cartfile b/Cartfile
index f7ed7b01..ef21b9ff 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.18.1
-github "mstarke/KeePassKit" "6f6a5c6b8d1a8fadb430a34f72785c67138ff58d"
+github "mstarke/KeePassKit" "a0d459f52e0d4d3c0b0fba92de6dc54ddffba486"
 github "mstarke/HNHUi" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index a814d4a8..3beb4df6 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "mstarke/HNHUi" "1.2"
-github "mstarke/KeePassKit" "6f6a5c6b8d1a8fadb430a34f72785c67138ff58d"
+github "mstarke/KeePassKit" "a0d459f52e0d4d3c0b0fba92de6dc54ddffba486"
 github "sparkle-project/Sparkle" "1.18.1"
diff --git a/MacPass/MPDatabaseSettingsWindowController.m b/MacPass/MPDatabaseSettingsWindowController.m
index 9da26d38..cc93a22d 100644
--- a/MacPass/MPDatabaseSettingsWindowController.m
+++ b/MacPass/MPDatabaseSettingsWindowController.m
@@ -259,6 +259,8 @@
 - (void)_setupAdvancedTab:(KPKTree *)tree {
   HNHUISetStateFromBool(self.enableTrashCheckButton, tree.metaData.useTrash);
   self.selectTrashGoupPopUpButton.enabled = tree.metaData.useTrash;
+  self.historyMaximumItemsTextField.stringValue = [NSString stringWithFormat:@"%ld", tree.metaData.historyMaxItems];
+  self.historyMaxiumSizeTextField.stringValue = [NSString stringWithFormat:@"%ld", tree.metaData.historyMaxSize];
   [self.enableTrashCheckButton bind:NSValueBinding toObject:self.selectTrashGoupPopUpButton withKeyPath:NSEnabledBinding options:nil];
   [self _updateTrashFolders:tree];
   
diff --git a/MacPass/MPDocument+Autotype.m b/MacPass/MPDocument+Autotype.m
index 3a3ed049..bac380d6 100644
--- a/MacPass/MPDocument+Autotype.m
+++ b/MacPass/MPDocument+Autotype.m
@@ -65,13 +65,18 @@
   MPAutotypeContext *context;
   for(KPKEntry *entry in autotypeEntries) {
     /* search in Autotype entries for match */
-    KPKWindowAssociation *association = [entry.autotype windowAssociationMatchingWindowTitle:windowTitle];
-    context = [[MPAutotypeContext alloc] initWithWindowAssociation:association];
-    if(context.valid) {
-      [contexts addObject:context];
-      continue; // association did match
-    }
     BOOL foundMatch = NO;
+    for(KPKWindowAssociation *association in [entry.autotype windowAssociationsMatchingWindowTitle:windowTitle]) {
+      context = [[MPAutotypeContext alloc] initWithWindowAssociation:association];
+      if(context.valid) {
+        foundMatch = YES;
+        [contexts addObject:context];
+      }
+    }
+    /* association match found, no need to use the default sequence! */
+    if(foundMatch) {
+      continue;
+    }
     /* Test for entry title in window title */
     if(matchTitle && !foundMatch) {
       foundMatch = [windowTitle rangeOfString:entry.title options:NSCaseInsensitiveSearch].length != 0 || [entry.title rangeOfString:windowTitle options:NSCaseInsensitiveSearch].length != 0;