diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 03d6b558c2d..742641675f2 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -54,31 +54,10 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 14
-      - uses: actions/cache@v1
-        name: Restore gradle cache
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}
-          # in case there is no cache for the current OS, fall back to any other OS
-          restore-keys: |
-            ${{ runner.os }}-gradle-cache-
-            Linux-gradle-cache-${{ hashFiles('**/*.gradle') }}
-            Windows-gradle-cache-${{ hashFiles('**/*.gradle') }}
-            macOS-gradle-cache-${{ hashFiles('**/*.gradle') }}
-      - uses: actions/cache@v1
-        name: Cache gradle wrapper
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-          # in case there is no cache for the current OS, fall back to any other OS
-          restore-keys: |
-            Linux-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-            Windows-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-            macOS-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
       - name: Build runtime image
         run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
       - name: Build installer
-        run: ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
+        run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
         shell: bash
       - name: Package application image
         run: ${{ matrix.archivePortable }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 31305f6f06d..db8e6e705ef 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -13,6 +13,6 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue will be closed in 7 days due to inactivity :zzz: Please provide the requested information if the problem persists.'
-        stale-issue-label: 's: stale'
+        stale-issue-label: 'status: stale'
         days-before-stale: 30
-        only-labels: 's: waiting-for-customer-feedback'
+        only-labels: 'status: waiting-for-customer-feedback'
diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml
index 4a1ef684c65..d57c0fd5ac5 100644
--- a/.idea/runConfigurations/JabRef_Main.xml
+++ b/.idea/runConfigurations/JabRef_Main.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="JabRef Main" type="Application" factoryName="Application" singleton="false">
     <option name="MAIN_CLASS_NAME" value="org.jabref.JabRefMain" />
     <module name="JabRef.main" />
+    <option name="REDIRECT_INPUT" value="true" />
     <option name="VM_PARAMETERS" value="--patch-module test=fastparse_2.12-1.0.0.jar --patch-module test2=fastparse-utils_2.12-1.0.0.jar --patch-module test3=sourcecode_2.12-0.1.4.jar --patch-module org.jabref=build/resources/main --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref --add-opens javafx.controls/javafx.scene.control=org.jabref --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.runtime=org.controlsfx.controls --add-exports javafx.web/com.sun.webkit=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle" />
     <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
     <RunnerSettings RunnerId="Profile ">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97c5b199eb6..2bee71d2d70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added tooltips for most fields in the entry editor containing a short description. [#5847](https://github.com/JabRef/jabref/issues/5847)
 - We added support for basic markdown in custom formatted previews [#6194](https://github.com/JabRef/jabref/issues/6194)
 - We now show the number of items found and selected to import in the online search dialog. [#6248](https://github.com/JabRef/jabref/pull/6248)
+- We created a new install screen for macOS. [#5759](https://github.com/JabRef/jabref/issues/5759)
 
 ### Changed
 
@@ -40,6 +41,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where custom exports with an uppercase file extension could not be selected for "Copy...-> Export to Clipboard" [#6285](https://github.com/JabRef/jabref/issues/6285)
 
 - We fixed the display of icon both in the main table and linked file editor. [#6169](https://github.com/JabRef/jabref/issues/6169)
+- We fixed the paste entry command in the menu and toolbar, that did not do anything. [#6293](https://github.com/JabRef/jabref/issues/6293)
+- We fixed an issue where the windows installer did not create an entry in the start menu [bug report in the forum](https://discourse.jabref.org/t/error-while-fetching-from-doi/2018/3)
 
 ### Removed
 
@@ -88,8 +91,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where citation styles except the default "Preview" could not be used. [#56220](https://github.com/JabRef/jabref/issues/5622)
 - We fixed an issue where a warning was displayed when the title content is made up of two sentences. [#5832](https://github.com/JabRef/jabref/issues/5832)
 - We fixed an issue where an exception was thrown when adding a save action without a selected formatter in the library properties [#6069](https://github.com/JabRef/jabref/issues/6069)
+- We fixed an issue where JabRef's icon was missing in the Export to clipboard Dialog. [#6286](https://github.com/JabRef/jabref/issues/6286)
 - We fixed an issue when an "Abstract field" was duplicating text, when importing from RIS file (Neurons) [#6065](https://github.com/JabRef/jabref/issues/6065)
 
+
 ### Removed
 
 - Ampersands are no longer escaped by default in the `bib` file. If you want to keep the current behaviour, you can use the new "Escape Ampersands" formatter as a save action. [#5869](https://github.com/JabRef/jabref/issues/5869)
@@ -245,6 +250,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added a 'LaTeX citations' tab to the entry editor, to search for citations to the active entry in the LaTeX file directory. It can be disabled in the preferences dialog.
 - We added an option in preferences to allow for integers in field "edition" when running database in bibtex mode. [#4680](https://github.com/JabRef/jabref/issues/4680)
 - We added the ability to use negation in export filter layouts. [#5138](https://github.com/JabRef/jabref/pull/5138)
+- Focus on Name Area instead of 'OK' button whenever user presses 'Add subgroup'. [#6307](https://github.com/JabRef/jabref/issues/6307)
 
 ### Fixed
 
diff --git a/README.md b/README.md
index 9470e7343bd..7f7567724aa 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ JabRef supports you in every step of your research work.
 - Easily retrieve and link full-text articles
 - Fetch complete bibliographic information based on ISBN, DOI, PubMed-ID and arXiv-ID
 - Extract metadata from PDFs
-- [JabFox Firefox Add-on](https://addons.mozilla.org/en-US/firefox/addon/jabfox/) lets you import new references directly from the browser with one click
+- Import new references directly from the browser with one click using the [official browser extension](https://github.com/JabRef/JabRef-Browser-Extension) for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/jabref/?src=external-github),  [Chrome](https://chrome.google.com/webstore/detail/jabref-browser-extension/bifehkofibaamoeaopjglfkddgkijdlh), [Edge](https://microsoftedge.microsoft.com/addons/detail/pgkajmkfgbehiomipedjhoddkejohfna) and [Vivaldi](https://chrome.google.com/webstore/detail/jabref-browser-extension/bifehkofibaamoeaopjglfkddgkijdlh)
 
 ### Organize
 
@@ -88,7 +88,7 @@ We view pull requests as a collaborative process.
 Submit a pull request early to get feedback from the team on work in progress.
 We will discuss improvements with you and agree to merge them once the [developers](https://github.com/JabRef/jabref/blob/master/DEVELOPERS) approve.
 
-If you want a step-by-step walk-through on how to set-up your workspace, please check [this guideline](https://devdocs.jabref.org/guidelines-for-setting-up-a-local-workspace/).
+If you want a step-by-step walk-through on how to set-up your workspace, please check [this guideline](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace).
 
 To compile JabRef from source, you need a Java Development Kit 14 and `JAVA_HOME` pointing to this JDK.
 To run it, just execute `gradlew run`.
diff --git a/build.gradle b/build.gradle
index bef63748c5d..501ed8f6743 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.28.0'
     id 'org.javamodularity.moduleplugin' version '1.5.0'
     id 'org.openjfx.javafxplugin' version '0.0.8'
-    id 'org.beryx.jlink' version '2.17.5'
+    id 'org.beryx.jlink' version '2.17.7'
 
     // nicer test outputs during running and completion
     id 'com.adarshr.test-logger' version '2.0.0'
@@ -128,10 +128,10 @@ dependencies {
     // See https://bugs.documentfoundation.org/show_bug.cgi?id=117331#c8 for background information
     // Use the task bundleLibreOffice to update the bundled jar
     // DO NOT CHANGE THE libreoffice PREFIX
-    libreoffice 'org.libreoffice:juh:6.3.2'
-    libreoffice 'org.libreoffice:jurt:6.3.2'
-    libreoffice 'org.libreoffice:ridl:6.3.2'
-    libreoffice 'org.libreoffice:unoil:6.3.2'
+    libreoffice 'org.libreoffice:juh:6.4.3'
+    libreoffice 'org.libreoffice:jurt:6.4.3'
+    libreoffice 'org.libreoffice:ridl:6.4.3'
+    libreoffice 'org.libreoffice:unoil:6.4.3'
 
     implementation 'io.github.java-diff-utils:java-diff-utils:4.5'
     implementation 'info.debatty:java-string-similarity:1.2.1'
@@ -151,7 +151,7 @@ dependencies {
         exclude module: 'oraclepki'
     }
 
-    implementation ('com.google.guava:guava:28.2-jre') {
+    implementation ('com.google.guava:guava:29.0-jre') {
         // TODO: Remove this as soon as https://github.com/google/guava/issues/2960 is fixed
         exclude module: "jsr305"
     }
@@ -165,7 +165,7 @@ dependencies {
     implementation 'de.saxsys:mvvmfx:1.8.0'
     implementation 'org.fxmisc.easybind:easybind:1.0.3'
     implementation 'org.fxmisc.flowless:flowless:0.6.1'
-    implementation 'org.fxmisc.richtext:richtextfx:0.10.4'
+    implementation 'org.fxmisc.richtext:richtextfx:0.10.5'
     implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
     implementation 'com.jfoenix:jfoenix:9.0.9'
     implementation 'org.controlsfx:controlsfx:11.0.1'
@@ -196,11 +196,11 @@ dependencies {
         exclude module: "log4j-core"
     }
 
-    implementation 'com.vladsch.flexmark:flexmark:0.61.6'
+    implementation 'com.vladsch.flexmark:flexmark:0.61.16'
     implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.61.6'
-    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.6'
+    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.61.16'
 
-    testImplementation 'io.github.classgraph:classgraph:4.8.69'
+    testImplementation 'io.github.classgraph:classgraph:4.8.71'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
     testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.6.2'
     testImplementation 'org.junit.platform:junit-platform-launcher:1.6.2'
@@ -648,9 +648,11 @@ jlink {
             installerOptions = [
                     '--vendor', 'JabRef',
                     '--app-version', "${project.version}",
+                    '--verbose',
                     '--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36',
                     '--win-dir-chooser',
                     '--win-shortcut',
+                    '--win-menu',
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows",
                     '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
@@ -662,6 +664,7 @@ jlink {
                     '--icon', "${projectDir}/src/main/resources/icons/JabRef-icon-64.png",
             ]
             installerOptions = [
+                    '--verbose',
                     '--vendor', 'JabRef',
                     '--app-version', "${project.version}",
                     // '--temp', "$buildDir/installer",
@@ -678,11 +681,14 @@ jlink {
         if (OperatingSystem.current().isMacOsX()) {
             imageOptions = [
                     '--icon', "${projectDir}/src/main/resources/icons/jabref.icns",
+                    '--resource-dir', "${projectDir}/buildres/mac"
             ]
             installerOptions = [
+                    '--verbose',
                     '--vendor', 'JabRef',
                     '--app-version', "${project.version}",
-                    '--file-associations', "${projectDir}/buildres/mac/bibtexAssociations.properties"
+                    '--file-associations', "${projectDir}/buildres/mac/bibtexAssociations.properties",
+                    '--resource-dir', "${projectDir}/buildres/mac"
             ]
         }
     }
diff --git a/buildres/mac/JabRef-background.tiff b/buildres/mac/JabRef-background.tiff
new file mode 100644
index 00000000000..62782b1a6c3
Binary files /dev/null and b/buildres/mac/JabRef-background.tiff differ
diff --git a/docs/adr/0009-use-plain-junit5-for-testing.md b/docs/adr/0009-use-plain-junit5-for-testing.md
new file mode 100644
index 00000000000..35d58bf1097
--- /dev/null
+++ b/docs/adr/0009-use-plain-junit5-for-testing.md
@@ -0,0 +1,83 @@
+# Use Plain JUnit5 for advanced test assertions
+
+## Context and Problem Statement
+
+How to write readable test assertions?
+How to write readable test assertions for advanced tests?
+
+## Considered Options
+
+* Plain JUnit5
+* Hamcrest
+* AssertJ
+
+## Decision Outcome
+
+Chosen option: "Plain JUnit5", because comes out best \(see below\).
+
+### Positive Consequences
+
+* Tests are more readable
+* More easy to write tests
+* More readable assertions
+
+### Negative Consequences
+
+* More complicated testing leads to more complicated assertions
+
+## Pros and Cons of the Options
+
+### Plain JUnit5
+
+Homepage: <https://junit.org/junit5/docs/current/user-guide/>
+JabRef testing guidelines: <https://devdocs.jabref.org/getting-into-the-code/code-howtos#test-cases>
+
+Example:
+
+```java
+String actual = markdownFormatter.format(source);
+assertTrue(actual.contains("Markup<br />"));
+assertTrue(actual.contains("<li>list item one</li>"));
+assertTrue(actual.contains("<li>list item 2</li>"));
+assertTrue(actual.contains("> rest"));
+assertFalse(actual.contains("\n"));
+```
+
+* Good, because Junit5 is "common Java knowledge"
+* Bad, because complex assertions tend to get hard to read
+* Bad, because no fluent API
+
+### Hamcrest
+
+Homepage: <http://hamcrest.org/JavaHamcrest/>
+
+* Good, because offers advanced matchers (such as `contains`)
+* Bad, because not full fluent API
+* Bad, because entry barrier is increased
+
+### AssertJ
+
+Homepage: <https://joel-costigliola.github.io/assertj/>
+
+Example:
+
+```java
+assertThat(markdownFormatter.format(source))
+        .contains("Markup<br />")
+        .contains("<li>list item one</li>")
+        .contains("<li>list item 2</li>")
+        .contains("> rest")
+        .doesNotContain("\n");
+```
+
+* Good, because offers fluent assertions
+* Good, because allows partial string testing to focus on important parts
+* Good, because assertions are more readable
+* Bad, because not commonly used
+* Bad, because newcomers have to learn an additional language to express test cases
+* Bad, because entry barrier is increased
+* Bad, because expressions of test cases vary from unit test to unit test
+
+## Links
+
+* German comparison between Hamcrest and AssertJ: <https://www.sigs-datacom.de/uploads/tx_dmjournals/philipp_JS_06_15_gRfN.pdf>
diff --git a/docs/teaching.md b/docs/teaching.md
index f73a0134f4e..a6e9c6726f8 100644
--- a/docs/teaching.md
+++ b/docs/teaching.md
@@ -120,6 +120,15 @@ Course [Open Source Software](https://github.com/igorsteinmacher/DSL-UTFPR)
 - Summary: Students are requested to contribute to an Open Source project to learn about the maintenance and evolution of software projects. This project is the predecessor of NAU's CS499.
 - Course offered from 2013 to 2016 with different names
 
+## Interesting Read for Students and Advisors
+
+- [Developing Procrastination Feedback for Student Software Developers](https://medium.com/@ayaankazerouni/developing-procrastination-feedback-for-student-software-developers-1652de60db7f) by [@ayaankazerouni](https://github.com/ayaankazerouni?tab=overview&from=2015-12-01&to=2015-12-31)  
+  > When students worked earlier and more often, they produced projects that:
+  >
+  > - were more correct,
+  > - were completed earlier,
+  > - took no more or less time to complete
+
 ## References
 
 <a id="LientzSwanson" href="#a1">1</a>: Lientz B., Swanson E., 1980: Software Maintenance Management. Addison Wesley, Reading, MA.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ef33d746b49..928fd3ca9be 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -48,9 +48,9 @@ environment:
 parts:
   jabref:
     plugin: dump
-    # source: build/distribution/JabRef-5.0-portable_linux.tar.gz
+    # source: build/distribution/JabRef-5.1-portable_linux.tar.gz
     # Use this source for debug purposes:
-    source: https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz
+    source: https://builds.jabref.org/master/JabRef-5.1-portable_linux.tar.gz
     stage-packages:
       - x11-utils
     override-build: |
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 341686c1aae..fcf37459bd6 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -14,9 +14,7 @@
 import javafx.scene.layout.StackPane;
 
 import org.jabref.Globals;
-import org.jabref.JabRefExecutorService;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
-import org.jabref.gui.autocompleter.AutoCompleteUpdater;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.collab.DatabaseChangeMonitor;
@@ -40,9 +38,7 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.database.KeyCollisionException;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
-import org.jabref.model.database.event.CoarseChangeFilter;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.database.shared.DatabaseLocation;
@@ -93,12 +89,10 @@ public class BasePanel extends StackPane {
     // the query the user searches when this BasePanel is active
     private Optional<SearchQuery> currentSearchQuery = Optional.empty();
     private Optional<DatabaseChangeMonitor> changeMonitor = Optional.empty();
-    private JabRefExecutorService executorService;
 
     public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabaseContext bibDatabaseContext, ExternalFileTypes externalFileTypes) {
         this.preferences = Objects.requireNonNull(preferences);
         this.frame = Objects.requireNonNull(frame);
-        this.executorService = JabRefExecutorService.INSTANCE;
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.externalFileTypes = Objects.requireNonNull(externalFileTypes);
         this.undoManager = frame.getUndoManager();
@@ -114,6 +108,7 @@ public BasePanel(JabRefFrame frame, BasePanelPreferences preferences, BibDatabas
         annotationCache = new FileAnnotationCache(bibDatabaseContext, Globals.prefs.getFilePreferences());
 
         setupMainPanel();
+        setupAutoCompletion();
 
         this.getDatabase().registerListener(new SearchListener());
         this.getDatabase().registerListener(new EntriesRemovedListener());
@@ -257,7 +252,6 @@ public void insertEntry(final BibEntry bibEntry) {
 
     public void insertEntries(final List<BibEntry> entries) {
         if (!entries.isEmpty()) {
-            try {
                 bibDatabaseContext.getDatabase().insertEntries(entries);
 
                 // Set owner and timestamp
@@ -276,9 +270,6 @@ public void insertEntries(final List<BibEntry> entries) {
                     showAndEdit(entries.get(0));
                 }
                 clearAndSelect(entries.get(0));
-            } catch (KeyCollisionException ex) {
-                LOGGER.info("Collision for bibtex key" + ex.getId(), ex);
-            }
         }
     }
 
@@ -379,11 +370,6 @@ public void setupMainPanel() {
 
         splitPane.getItems().add(mainTable);
 
-        // Set up name autocompleter for search:
-        setupAutoCompletion();
-        executorService.execute(this::instantiateSearchAutoCompleter);
-        this.getDatabase().registerListener(new SearchAutoCompleteListener());
-
         // Saves the divider position as soon as it changes
         // We need to keep a reference to the subscription, otherwise the binding gets garbage collected
         dividerPositionSubscription = EasyBind.monadic(Bindings.valueAt(splitPane.getDividers(), 0))
@@ -413,28 +399,18 @@ public void setupMainPanel() {
     private void setupAutoCompletion() {
         AutoCompletePreferences autoCompletePreferences = preferences.getAutoCompletePreferences();
         if (autoCompletePreferences.shouldAutoComplete()) {
-            suggestionProviders = new SuggestionProviders(autoCompletePreferences, Globals.journalAbbreviationLoader);
-            suggestionProviders.indexDatabase(getDatabase());
-            // Ensure that the suggestion providers are in sync with entries
-            CoarseChangeFilter changeFilter = new CoarseChangeFilter(bibDatabaseContext);
-            changeFilter.registerListener(new AutoCompleteUpdater(suggestionProviders));
+            suggestionProviders = new SuggestionProviders(getDatabase(), autoCompletePreferences, Globals.journalAbbreviationLoader);
         } else {
             // Create empty suggestion providers if auto completion is deactivated
             suggestionProviders = new SuggestionProviders();
         }
+        searchAutoCompleter = new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields(), getDatabase());
     }
 
     public void updateSearchManager() {
         frame.getGlobalSearchBar().setAutoCompleter(searchAutoCompleter);
     }
 
-    private void instantiateSearchAutoCompleter() {
-        searchAutoCompleter = new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields());
-        for (BibEntry entry : bibDatabaseContext.getDatabase().getEntries()) {
-            searchAutoCompleter.indexEntry(entry);
-        }
-    }
-
     private void adjustSplitter() {
         if (mode == BasePanelMode.SHOWING_EDITOR) {
             splitPane.setDividerPositions(preferences.getEntryEditorDividerPosition());
@@ -730,23 +706,6 @@ public void listen(EntriesRemovedEvent entriesRemovedEvent) {
         }
     }
 
-    /**
-     * Ensures that the search auto completer is up to date when entries are changed AKA Let the auto completer, if any,
-     * harvest words from the entry Actual methods for autocomplete indexing  must run in javafx thread
-     */
-    private class SearchAutoCompleteListener {
-
-        @Subscribe
-        public void listen(EntriesAddedEvent addedEntriesEvent) {
-            DefaultTaskExecutor.runInJavaFXThread(() -> addedEntriesEvent.getBibEntries().forEach(entry -> searchAutoCompleter.indexEntry(entry)));
-        }
-
-        @Subscribe
-        public void listen(EntryChangedEvent entryChangedEvent) {
-            DefaultTaskExecutor.runInJavaFXThread(() -> searchAutoCompleter.indexEntry(entryChangedEvent.getBibEntry()));
-        }
-    }
-
     /**
      * Ensures that the results of the current search are updated when a new entry is inserted into the database Actual
      * methods for performing search must run in javafx thread
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index aa538ebb722..e0178808ce2 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -120,6 +120,7 @@ public static String shortenDialogMessage(String dialogMessage) {
     @Override
     public <T> Optional<T> showChoiceDialogAndWait(String title, String content, String okButtonLabel, T defaultChoice, Collection<T> choices) {
         ChoiceDialog<T> choiceDialog = new ChoiceDialog<>(defaultChoice, choices);
+        ((Stage) choiceDialog.getDialogPane().getScene().getWindow()).getIcons().add(IconTheme.getJabRefImageFX());
         ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         choiceDialog.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
         choiceDialog.setHeaderText(title);
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
index bd2088e6a3c..99ba956eb46 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
@@ -8,26 +8,24 @@
 
 public class AutoCompletePreferences {
 
-    private boolean shouldAutoComplete;
-    private AutoCompleteFirstNameMode firstNameMode;
-    private boolean onlyCompleteLastFirst;
-    private boolean onlyCompleteFirstLast;
-    private Set<Field> completeFields;
+    public enum NameFormat {
+        LAST_FIRST, FIRST_LAST, BOTH
+    }
+
+    private final boolean shouldAutoComplete;
+    private final AutoCompleteFirstNameMode firstNameMode;
+    private final NameFormat nameFormat;
+    private final Set<Field> completeFields;
     private final JournalAbbreviationPreferences journalAbbreviationPreferences;
 
-    public AutoCompletePreferences(boolean shouldAutoComplete, AutoCompleteFirstNameMode firstNameMode, boolean onlyCompleteLastFirst, boolean onlyCompleteFirstLast, Set<Field> completeFields, JournalAbbreviationPreferences journalAbbreviationPreferences) {
+    public AutoCompletePreferences(boolean shouldAutoComplete, AutoCompleteFirstNameMode firstNameMode, NameFormat nameFormat, Set<Field> completeFields, JournalAbbreviationPreferences journalAbbreviationPreferences) {
         this.shouldAutoComplete = shouldAutoComplete;
         this.firstNameMode = firstNameMode;
-        this.onlyCompleteLastFirst = onlyCompleteLastFirst;
-        this.onlyCompleteFirstLast = onlyCompleteFirstLast;
+        this.nameFormat = nameFormat;
         this.completeFields = completeFields;
         this.journalAbbreviationPreferences = journalAbbreviationPreferences;
     }
 
-    public void setShouldAutoComplete(boolean shouldAutoComplete) {
-        this.shouldAutoComplete = shouldAutoComplete;
-    }
-
     public boolean shouldAutoComplete() {
         return shouldAutoComplete;
     }
@@ -39,25 +37,7 @@ public AutoCompleteFirstNameMode getFirstNameMode() {
         return firstNameMode;
     }
 
-    public void setFirstNameMode(AutoCompleteFirstNameMode firstNameMode) {
-        this.firstNameMode = firstNameMode;
-    }
-
-    public boolean getOnlyCompleteLastFirst() {
-        return onlyCompleteLastFirst;
-    }
-
-    public void setOnlyCompleteLastFirst(boolean onlyCompleteLastFirst) {
-        this.onlyCompleteLastFirst = onlyCompleteLastFirst;
-    }
-
-    public boolean getOnlyCompleteFirstLast() {
-        return onlyCompleteFirstLast;
-    }
-
-    public void setOnlyCompleteFirstLast(boolean onlyCompleteFirstLast) {
-        this.onlyCompleteFirstLast = onlyCompleteFirstLast;
-    }
+    public NameFormat getNameFormat() { return nameFormat; }
 
     /**
      * Returns the list of fields for which autocomplete is enabled
@@ -67,14 +47,6 @@ public Set<Field> getCompleteFields() {
         return completeFields;
     }
 
-    public void setCompleteFields(Set<Field> completeFields) {
-        this.completeFields = completeFields;
-    }
-
-    public void setCompleteNames(String input) {
-        setCompleteFields(FieldFactory.parseFieldList(input));
-    }
-
     public String getCompleteNamesAsString() {
         return FieldFactory.serializeFieldsList(completeFields);
     }
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java
deleted file mode 100644
index 1f188238191..00000000000
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteSuggestionProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.jabref.gui.autocompleter;
-
-import java.util.Collection;
-
-import javafx.util.Callback;
-
-import org.jabref.model.entry.BibEntry;
-
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-
-public interface AutoCompleteSuggestionProvider<T> extends Callback<AutoCompletionBinding.ISuggestionRequest, Collection<T>> {
-    void indexEntry(BibEntry entry);
-}
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java
deleted file mode 100644
index 7ace3ef5bba..00000000000
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompleteUpdater.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.jabref.gui.autocompleter;
-
-import java.util.List;
-
-import org.jabref.model.database.event.EntriesAddedEvent;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.event.EntryChangedEvent;
-
-import com.google.common.eventbus.Subscribe;
-
-/**
- * Ensures that suggestion providers are up to date when entries are changed or added.
- */
-public class AutoCompleteUpdater {
-
-    private final SuggestionProviders suggestionProviders;
-
-    public AutoCompleteUpdater(SuggestionProviders suggestionProviders) {
-        this.suggestionProviders = suggestionProviders;
-    }
-
-    @Subscribe
-    public void listen(EntriesAddedEvent entryAddedEvent) {
-        List<BibEntry> entries = entryAddedEvent.getBibEntries();
-        for (BibEntry entry : entries) {
-            suggestionProviders.indexEntry(entry);
-        }
-    }
-
-    @Subscribe
-    public void listen(EntryChangedEvent entryChangedEvent) {
-        suggestionProviders.indexEntry(entryChangedEvent.getBibEntry());
-    }
-}
diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
index 3a5ecbffae4..3cf297c71c1 100644
--- a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
@@ -1,25 +1,31 @@
 package org.jabref.gui.autocompleter;
 
 import java.util.Comparator;
+import java.util.stream.Stream;
 
 import org.jabref.logic.bibtex.comparator.EntryComparator;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.strings.StringUtil;
 
+import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
 
 /**
  * Delivers possible completions as a list of {@link BibEntry} based on their cite key.
  */
-public class BibEntrySuggestionProvider extends SuggestionProvider<BibEntry> implements AutoCompleteSuggestionProvider<BibEntry> {
+public class BibEntrySuggestionProvider extends SuggestionProvider<BibEntry> {
 
-    @Override
-    public void indexEntry(BibEntry entry) {
-        if (entry == null) {
-            return;
-        }
+    private final BibDatabase database;
+
+    public BibEntrySuggestionProvider(BibDatabase database) {
+        this.database = database;
+    }
 
-        addPossibleSuggestions(entry);
+    @Override
+    protected Equivalence<BibEntry> getEquivalence() {
+        return Equivalence.equals().onResultOf(BibEntry::getCiteKeyOptional);
     }
 
     @Override
@@ -28,10 +34,15 @@ protected Comparator<BibEntry> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(BibEntry suggestion, AutoCompletionBinding.ISuggestionRequest request) {
-        String userTextLower = request.getUserText().toLowerCase();
-        return suggestion.getCiteKeyOptional()
-                .map(key -> key.toLowerCase().contains(userTextLower))
-                .orElse(false);
+    protected boolean isMatch(BibEntry entry, AutoCompletionBinding.ISuggestionRequest request) {
+        String userText = request.getUserText();
+        return entry.getCiteKeyOptional()
+                    .map(key -> StringUtil.containsIgnoreCase(key, userText))
+                    .orElse(false);
+    }
+
+    @Override
+    public Stream<BibEntry> getSource() {
+        return database.getEntries().parallelStream();
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
index 6c969f2713b..dc2299fa685 100644
--- a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
@@ -1,22 +1,17 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-
-import org.jabref.model.entry.BibEntry;
-
-import org.controlsfx.control.textfield.AutoCompletionBinding;
+import java.util.stream.Stream;
 
 /**
  * Enriches a suggestion provider by a given set of content selector values.
  */
-public class ContentSelectorSuggestionProvider implements AutoCompleteSuggestionProvider<String> {
+public class ContentSelectorSuggestionProvider extends StringSuggestionProvider {
 
-    private final AutoCompleteSuggestionProvider<String> suggestionProvider;
+    private final SuggestionProvider<String> suggestionProvider;
     private final List<String> contentSelectorValues;
 
-    public ContentSelectorSuggestionProvider(AutoCompleteSuggestionProvider<String> suggestionProvider,
+    public ContentSelectorSuggestionProvider(SuggestionProvider<String> suggestionProvider,
                                              List<String> contentSelectorValues) {
 
         this.suggestionProvider = suggestionProvider;
@@ -24,17 +19,7 @@ public ContentSelectorSuggestionProvider(AutoCompleteSuggestionProvider<String>
     }
 
     @Override
-    public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
-        List<String> suggestions = new ArrayList<>();
-        if (suggestionProvider != null) {
-            suggestions.addAll(suggestionProvider.call(request));
-        }
-        suggestions.addAll(contentSelectorValues);
-        return suggestions;
-    }
-
-    @Override
-    public void indexEntry(BibEntry entry) {
-        suggestionProvider.indexEntry(entry);
+    public Stream<String> getSource() {
+        return Stream.concat(contentSelectorValues.stream(), suggestionProvider.getSource());
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
new file mode 100644
index 00000000000..ab7df191fb5
--- /dev/null
+++ b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
@@ -0,0 +1,29 @@
+package org.jabref.gui.autocompleter;
+
+import java.util.Comparator;
+import java.util.stream.Stream;
+
+import com.google.common.base.Equivalence;
+import org.controlsfx.control.textfield.AutoCompletionBinding;
+
+public class EmptySuggestionProvider extends SuggestionProvider<String> {
+    @Override
+    protected Equivalence<String> getEquivalence() {
+        return Equivalence.equals().onResultOf(value -> value);
+    }
+
+    @Override
+    protected Comparator<String> getComparator() {
+        return Comparator.naturalOrder();
+    }
+
+    @Override
+    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
+        return false;
+    }
+
+    @Override
+    public Stream<String> getSource() {
+        return Stream.empty();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
index 87048951ec4..1fae672e250 100644
--- a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
@@ -1,27 +1,26 @@
 package org.jabref.gui.autocompleter;
 
 import java.util.Objects;
+import java.util.stream.Stream;
 
-import org.jabref.model.entry.BibEntry;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
 /**
  * Stores the full content of one field.
  */
-class FieldValueSuggestionProvider extends StringSuggestionProvider implements AutoCompleteSuggestionProvider<String> {
+class FieldValueSuggestionProvider extends StringSuggestionProvider {
 
     private final Field field;
+    private final BibDatabase database;
 
-    FieldValueSuggestionProvider(Field field) {
+    FieldValueSuggestionProvider(Field field, BibDatabase database) {
         this.field = Objects.requireNonNull(field);
+        this.database = database;
     }
 
     @Override
-    public void indexEntry(BibEntry entry) {
-        if (entry == null) {
-            return;
-        }
-
-        entry.getField(field).ifPresent(fieldValue -> addPossibleSuggestions(fieldValue.trim()));
+    public Stream<String> getSource() {
+        return database.getEntries().parallelStream().flatMap(entry -> entry.getField(field).stream());
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
index 5e8b5c95f4d..37e5d872977 100644
--- a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.jabref.logic.journals.Abbreviation;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
-import org.jabref.logic.journals.JournalAbbreviationPreferences;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
 public class JournalsSuggestionProvider extends FieldValueSuggestionProvider {
 
-    JournalsSuggestionProvider(Field field, AutoCompletePreferences preferences,
+    JournalsSuggestionProvider(Field field, BibDatabase database, AutoCompletePreferences preferences,
                                JournalAbbreviationLoader abbreviationLoader) {
-        super(field);
+        super(field, database);
+
+        /*
+        TODO: Reenable
 
         JournalAbbreviationPreferences journalAbbreviationPreferences = preferences.getJournalAbbreviationPreferences();
         List<String> journals = abbreviationLoader.getRepository(journalAbbreviationPreferences)
@@ -20,5 +19,6 @@ public class JournalsSuggestionProvider extends FieldValueSuggestionProvider {
                 .map(Abbreviation::getName)
                 .collect(Collectors.toList());
         addPossibleSuggestions(journals);
+         */
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
index a37ed5c9b87..04d085fcb1b 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
@@ -18,15 +18,20 @@ public PersonNameStringConverter(boolean autoCompFF, boolean autoCompLF, AutoCom
     }
 
     public PersonNameStringConverter(AutoCompletePreferences preferences) {
-        if (preferences.getOnlyCompleteFirstLast()) {
-            autoCompFF = true;
-            autoCompLF = false;
-        } else if (preferences.getOnlyCompleteLastFirst()) {
-            autoCompFF = false;
-            autoCompLF = true;
-        } else {
-            autoCompFF = true;
-            autoCompLF = true;
+        switch (preferences.getNameFormat()) {
+            case FIRST_LAST:
+                autoCompFF = true;
+                autoCompLF = false;
+                break;
+            case LAST_FIRST:
+                autoCompFF = false;
+                autoCompLF = true;
+                break;
+            default:
+            case BOTH:
+                autoCompFF = true;
+                autoCompLF = true;
+                break;
         }
 
         autoCompleteFirstNameMode = preferences.getFirstNameMode();
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
index db84646648d..2ff7d4a4ed1 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
@@ -3,59 +3,68 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Stream;
 
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
+import org.jabref.model.strings.StringUtil;
 
+import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
 
 /**
  * Delivers possible completions as a list of {@link Author}s.
  */
-public class PersonNameSuggestionProvider extends SuggestionProvider<Author> implements AutoCompleteSuggestionProvider<Author> {
+public class PersonNameSuggestionProvider extends SuggestionProvider<Author> {
 
     private final Collection<Field> fields;
-    private final Comparator<Author> authorComparator = Comparator.comparing(Author::getNameForAlphabetization);
+    private final BibDatabase database;
 
-    PersonNameSuggestionProvider(Field fieldName) {
-        this(Collections.singletonList(Objects.requireNonNull(fieldName)));
+    PersonNameSuggestionProvider(Field field, BibDatabase database) {
+        this(Collections.singletonList(Objects.requireNonNull(field)), database);
     }
 
-    public PersonNameSuggestionProvider(Collection<Field> fields) {
+    public PersonNameSuggestionProvider(Collection<Field> fields, BibDatabase database) {
         super();
 
         this.fields = Objects.requireNonNull(fields);
+        this.database = database;
+    }
 
+    public Stream<Author> getAuthors(BibEntry entry) {
+        return entry.getFieldMap()
+                    .entrySet()
+                    .stream()
+                    .filter(fieldValuePair -> fields.contains(fieldValuePair.getKey()))
+                    .map(Map.Entry::getValue)
+                    .map(AuthorList::parse)
+                    .flatMap(authors -> authors.getAuthors().stream());
     }
 
     @Override
-    public void indexEntry(BibEntry entry) {
-        if (entry == null) {
-            return;
-        }
-
-        for (Field field : fields) {
-            entry.getField(field).ifPresent(fieldValue -> {
-                AuthorList authorList = AuthorList.parse(fieldValue);
-                for (Author author : authorList.getAuthors()) {
-                    addPossibleSuggestions(author);
-                }
-            });
-        }
+    protected Equivalence<Author> getEquivalence() {
+        return Equivalence.equals().onResultOf(Author::getLastOnly);
     }
 
     @Override
     protected Comparator<Author> getComparator() {
-        return authorComparator;
+        return Comparator.comparing(Author::getNameForAlphabetization);
+    }
+
+    @Override
+    protected boolean isMatch(Author candidate, AutoCompletionBinding.ISuggestionRequest request) {
+        return StringUtil.containsIgnoreCase(candidate.getLastFirst(false), request.getUserText());
     }
 
     @Override
-    protected boolean isMatch(Author suggestion, AutoCompletionBinding.ISuggestionRequest request) {
-        String userTextLower = request.getUserText().toLowerCase();
-        String suggestionStr = suggestion.getLastFirst(false).toLowerCase();
-        return suggestionStr.contains(userTextLower);
+    public Stream<Author> getSource() {
+        return database.getEntries()
+                       .parallelStream()
+                       .flatMap(this::getAuthors);
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
index 1ec2cf0c97d..01ba19ef39e 100644
--- a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
@@ -1,26 +1,30 @@
 package org.jabref.gui.autocompleter;
 
 import java.util.Comparator;
+import java.util.stream.Stream;
 
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-
-class StringSuggestionProvider extends SuggestionProvider<String> {
+import org.jabref.model.strings.StringUtil;
 
-    private final Comparator<String> stringComparator = Comparator.naturalOrder();
+import com.google.common.base.Equivalence;
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 
-    public StringSuggestionProvider() {
+abstract class StringSuggestionProvider extends SuggestionProvider<String> {
 
+    @Override
+    protected Equivalence<String> getEquivalence() {
+        return Equivalence.equals().onResultOf(value -> value);
     }
 
     @Override
     protected Comparator<String> getComparator() {
-        return stringComparator;
+        return Comparator.naturalOrder();
     }
 
     @Override
-    protected boolean isMatch(String suggestion, AutoCompletionBinding.ISuggestionRequest request) {
-        String userTextLower = request.getUserText().toLowerCase();
-        String suggestionStr = suggestion.toLowerCase();
-        return suggestionStr.contains(userTextLower);
+    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
+        return StringUtil.containsIgnoreCase(candidate, request.getUserText());
     }
+
+    @Override
+    public abstract Stream<String> getSource();
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
index ee18b7d7b26..8d6bba4633a 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
@@ -26,145 +26,49 @@
  */
 package org.jabref.gui.autocompleter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-
-import javafx.util.Callback;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding.ISuggestionRequest;
 
 /**
  * This is a simple implementation of a generic suggestion provider callback.
- * The complexity of suggestion generation is O(n) where n is the number of possible suggestions.
  *
  * @param <T> Type of suggestions
- *
- * This class is a copy of {@link impl.org.controlsfx.autocompletion.SuggestionProvider} with the only difference that
- *           we use a set instead of list to store the suggestions in order to eliminate duplicates.
  */
-public abstract class SuggestionProvider<T> implements Callback<ISuggestionRequest, Collection<T>> {
-
-    private final Collection<T> possibleSuggestions = new HashSet<>();
-    private final Object possibleSuggestionsLock = new Object();
-
-    /**
-     * Create a default suggestion provider based on the toString() method of the generic objects
-     * @param possibleSuggestions All possible suggestions
-     */
-    public static <T> SuggestionProvider<T> create(Collection<T> possibleSuggestions) {
-        return create(null, possibleSuggestions);
-    }
-
-    /**
-     * Create a default suggestion provider based on the toString() method of the generic objects
-     * using the provided stringConverter
-     *
-     * @param stringConverter A stringConverter which converts generic T into a string
-     * @param possibleSuggestions All possible suggestions
-     */
-    public static <T> SuggestionProvider<T> create(Callback<T, String> stringConverter, Collection<T> possibleSuggestions) {
-        SuggestionProviderString<T> suggestionProvider = new SuggestionProviderString<>(stringConverter);
-        suggestionProvider.addPossibleSuggestions(possibleSuggestions);
-        return suggestionProvider;
-    }
-
-    /**
-     * Add the given new possible suggestions to this  SuggestionProvider
-     */
-    public void addPossibleSuggestions(@SuppressWarnings("unchecked") T... newPossible) {
-        addPossibleSuggestions(Arrays.asList(newPossible));
-    }
-
-    /**
-     * Add the given new possible suggestions to this  SuggestionProvider
-     */
-    public void addPossibleSuggestions(Collection<T> newPossible) {
-        synchronized (possibleSuggestionsLock) {
-            possibleSuggestions.addAll(newPossible);
-        }
-    }
-
-    /**
-     * Remove all current possible suggestions
-     */
-    public void clearSuggestions() {
-        synchronized (possibleSuggestionsLock) {
-            possibleSuggestions.clear();
-        }
-    }
+public abstract class SuggestionProvider<T> {
 
-    @Override
-    public final Collection<T> call(final ISuggestionRequest request) {
-        List<T> suggestions = new ArrayList<>();
+    public final Collection<T> provideSuggestions(ISuggestionRequest request) {
         if (!request.getUserText().isEmpty()) {
-            synchronized (possibleSuggestionsLock) {
-                for (T possibleSuggestion : possibleSuggestions) {
-                    if (isMatch(possibleSuggestion, request)) {
-                        suggestions.add(possibleSuggestion);
-                    }
-                }
-            }
-            suggestions.sort(getComparator());
+            Comparator<T> comparator = getComparator();
+            Equivalence<T> equivalence = getEquivalence();
+            return getSource().filter(candidate -> isMatch(candidate, request))
+                              .map(equivalence::wrap) // Need to do a bit of acrobatic as there is no distinctBy method
+                              .distinct()
+                              .limit(10)
+                              .map(Equivalence.Wrapper::get)
+                              .sorted(comparator)
+                              .collect(Collectors.toList());
+        } else {
+            return Collections.emptyList();
         }
-        return suggestions;
     }
 
+    protected abstract Equivalence<T> getEquivalence();
+
     /**
      * Get the comparator to order the suggestions
      */
     protected abstract Comparator<T> getComparator();
 
     /**
-     * Check the given possible suggestion is a match (is a valid suggestion)
-     */
-    protected abstract boolean isMatch(T suggestion, ISuggestionRequest request);
-
-    /**
-     * This is a simple string based suggestion provider.
-     * All generic suggestions T are turned into strings for processing.
-     *
+     * Check the given candidate is a match (ie a valid suggestion)
      */
-    private static class SuggestionProviderString<T> extends SuggestionProvider<T> {
+    protected abstract boolean isMatch(T candidate, ISuggestionRequest request);
 
-        private Callback<T, String> stringConverter;
-
-        private final Comparator<T> stringComparator = new Comparator<T>() {
-            @Override
-            public int compare(T o1, T o2) {
-                String o1str = stringConverter.call(o1);
-                String o2str = stringConverter.call(o2);
-                return o1str.compareTo(o2str);
-            }
-        };
-
-        /**
-         * Create a new SuggestionProviderString
-         */
-        public SuggestionProviderString(Callback<T, String> stringConverter) {
-            this.stringConverter = stringConverter;
-
-            // In case no stringConverter was provided, use the default strategy
-            if (this.stringConverter == null) {
-                this.stringConverter = obj -> obj != null ? obj.toString() : "";
-            }
-        }
-
-        /**{@inheritDoc}*/
-        @Override
-        protected Comparator<T> getComparator() {
-            return stringComparator;
-        }
-
-        /**{@inheritDoc}*/
-        @Override
-        protected boolean isMatch(T suggestion, ISuggestionRequest request) {
-            String userTextLower = request.getUserText().toLowerCase();
-            String suggestionStr = suggestion.toString().toLowerCase();
-            return suggestionStr.contains(userTextLower);
-        }
-    }
+    public abstract Stream<T> getSource();
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
index 4f8f76a405c..b05caec70c8 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
@@ -1,72 +1,47 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.StandardField;
 
 public class SuggestionProviders {
 
-    /**
-     * key: field name
-     */
-    private final Map<Field, AutoCompleteSuggestionProvider<?>> providers = new HashMap<>();
+    private final boolean isEmpty;
+    private BibDatabase database;
+    private AutoCompletePreferences preferences;
+    private JournalAbbreviationLoader abbreviationLoader;
 
-    /**
-     * Empty
-     */
-    public SuggestionProviders() {
-
-    }
-
-    public SuggestionProviders(AutoCompletePreferences preferences,
-            JournalAbbreviationLoader abbreviationLoader) {
-        Objects.requireNonNull(preferences);
-
-        Set<Field> completeFields = preferences.getCompleteFields();
-        for (Field field : completeFields) {
-            AutoCompleteSuggestionProvider<?> autoCompleter = initalizeSuggestionProvider(field, preferences, abbreviationLoader);
-            providers.put(field, autoCompleter);
-        }
+    public SuggestionProviders(BibDatabase database, AutoCompletePreferences preferences, JournalAbbreviationLoader abbreviationLoader) {
+        this.database = database;
+        this.preferences = Objects.requireNonNull(preferences);
+        this.abbreviationLoader = abbreviationLoader;
+        this.isEmpty = false;
     }
 
-    public AutoCompleteSuggestionProvider<?> getForField(Field field) {
-        return providers.get(field);
-    }
-
-    public void indexDatabase(BibDatabase database) {
-        for (BibEntry entry : database.getEntries()) {
-            indexEntry(entry);
-        }
+    public SuggestionProviders() {
+        this.isEmpty = true;
     }
 
-    /**
-     * This methods assures all information in the given entry is included as suggestions.
-     */
-    public void indexEntry(BibEntry bibEntry) {
-        for (AutoCompleteSuggestionProvider<?> autoCompleter : providers.values()) {
-            autoCompleter.indexEntry(bibEntry);
+    public SuggestionProvider<?> getForField(Field field) {
+        if (isEmpty) {
+            return new EmptySuggestionProvider();
         }
-    }
 
-    private AutoCompleteSuggestionProvider<?> initalizeSuggestionProvider(Field field, AutoCompletePreferences preferences, JournalAbbreviationLoader abbreviationLoader) {
         Set<FieldProperty> fieldProperties = field.getProperties();
         if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
-            return new PersonNameSuggestionProvider(field);
+            return new PersonNameSuggestionProvider(field, database);
         } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-            return new BibEntrySuggestionProvider();
+            return new BibEntrySuggestionProvider(database);
         } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)
                 || StandardField.PUBLISHER.equals(field)) {
-            return new JournalsSuggestionProvider(field, preferences, abbreviationLoader);
+            return new JournalsSuggestionProvider(field, database, preferences, abbreviationLoader);
         } else {
-            return new WordSuggestionProvider(field);
+            return new WordSuggestionProvider(field, database);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
index a591d684a3b..f83d047b0f7 100644
--- a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
@@ -1,35 +1,28 @@
 package org.jabref.gui.autocompleter;
 
 import java.util.Objects;
-import java.util.StringTokenizer;
+import java.util.stream.Stream;
 
-import org.jabref.model.entry.BibEntry;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
 /**
- * Stores all words in the given field which are separated by SEPARATING_CHARS.
+ * Stores all words in the given field.
  */
-public class WordSuggestionProvider extends StringSuggestionProvider implements AutoCompleteSuggestionProvider<String> {
-
-    private static final String SEPARATING_CHARS = ";,\n ";
+public class WordSuggestionProvider extends StringSuggestionProvider {
 
     private final Field field;
+    private final BibDatabase database;
 
-    public WordSuggestionProvider(Field field) {
+    public WordSuggestionProvider(Field field, BibDatabase database) {
         this.field = Objects.requireNonNull(field);
+        this.database = database;
     }
 
     @Override
-    public void indexEntry(BibEntry entry) {
-        if (entry == null) {
-            return;
-        }
-
-        entry.getField(field).ifPresent(fieldValue -> {
-            StringTokenizer tok = new StringTokenizer(fieldValue, SEPARATING_CHARS);
-            while (tok.hasMoreTokens()) {
-                addPossibleSuggestions(tok.nextToken());
-            }
-        });
+    public Stream<String> getSource() {
+        return database.getEntries()
+                       .parallelStream()
+                       .flatMap(entry -> entry.getFieldAsWords(field).stream());
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java b/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
index 678256e4cee..90789e32990 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
@@ -4,29 +4,28 @@
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.undo.UndoableKeyChange;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.preferences.PreferencesService;
 
 public class GenerateBibtexKeySingleAction extends SimpleCommand {
 
-    private DialogService dialogService;
-    private BibDatabaseContext databaseContext;
-    private EntryEditorPreferences preferences;
-    private BibEntry entry;
-    private UndoManager undoManager;
+    private final DialogService dialogService;
+    private final BibDatabaseContext databaseContext;
+    private final PreferencesService preferencesService;
+    private final BibEntry entry;
+    private final UndoManager undoManager;
 
-    public GenerateBibtexKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, EntryEditorPreferences preferences, UndoManager undoManager) {
+    public GenerateBibtexKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager) {
         this.entry = entry;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
-        this.preferences = preferences;
+        this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        if (preferences.avoidOverwritingCiteKey()) {
-            // Only make command executable if cite key is empty
+        if (preferencesService.getBibtexKeyPatternPreferences().avoidOverwritingCiteKey()) {
             this.executable.bind(entry.getCiteKeyBinding().isNull());
         }
     }
@@ -34,7 +33,7 @@ public GenerateBibtexKeySingleAction(BibEntry entry, BibDatabaseContext database
     @Override
     public void execute() {
         if (!entry.hasCiteKey() || GenerateBibtexKeyAction.confirmOverwriteKeys(dialogService)) {
-            new BibtexKeyGenerator(databaseContext, preferences.getBibtexKeyPatternPreferences())
+            new BibtexKeyGenerator(databaseContext, preferencesService.getBibtexKeyPatternPreferences())
                     .generateAndSetKey(entry)
                     .ifPresent(change -> undoManager.addEdit(new UndoableKeyChange(change)));
         }
diff --git a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
index 521b9ac1d76..f09fd144411 100644
--- a/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.customizefields;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -11,7 +12,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class CustomizeGeneralFieldsDialogViewModel {
@@ -23,13 +23,16 @@ public class CustomizeGeneralFieldsDialogViewModel {
     public CustomizeGeneralFieldsDialogViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        setInitialFieldsText();
+
+        // Using stored custom values or, if they do not exist, default values
+        setFieldsText(preferences.getEntryEditorTabList());
     }
 
-    private void setInitialFieldsText() {
+    private void setFieldsText(Map<String, Set<Field>> tabNamesAndFields) {
         StringBuilder sb = new StringBuilder();
 
-        for (Map.Entry<String, Set<Field>> tab : preferences.getEntryEditorTabList().entrySet()) {
+        // Fill with customized vars
+        for (Map.Entry<String, Set<Field>> tab : tabNamesAndFields.entrySet()) {
             sb.append(tab.getKey());
             sb.append(':');
             sb.append(FieldFactory.serializeFieldsList(tab.getValue()));
@@ -43,48 +46,35 @@ public StringProperty fieldsTextProperty() {
     }
 
     public void saveFields() {
+        Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
         String[] lines = fieldsText.get().split("\n");
-        int i = 0;
-        for (; i < lines.length; i++) {
-            String[] parts = lines[i].split(":");
+
+        for (String line : lines) {
+            String[] parts = line.split(":");
             if (parts.length != 2) {
-                // Report error and exit.
-                String field = Localization.lang("field");
-                String title = Localization.lang("Error");
-                String content = Localization.lang("Each line must be of the following form") + " '" +
-                                 Localization.lang("Tabname") + ':' + field + "1;" + field + "2;...;" + field + "N'";
-                dialogService.showInformationDialogAndWait(title, content);
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Error"),
+                        Localization.lang("Each line must be of the following form: 'tab:field1;field2;...;fieldN'."));
                 return;
             }
 
             String testString = BibtexKeyGenerator.cleanKey(parts[1], preferences.getEnforceLegalKeys());
             if (!testString.equals(parts[1]) || (parts[1].indexOf('&') >= 0)) {
-                String title = Localization.lang("Error");
-                String content = Localization.lang("Field names are not allowed to contain white space or the following "
-                                                   + "characters")
-                                 + ": # { } ( ) ~ , ^ & - \" ' ` ʹ \\";
-                dialogService.showInformationDialogAndWait(title, content);
+                dialogService.showInformationDialogAndWait(
+                        Localization.lang("Error"),
+                        Localization.lang("Field names are not allowed to contain white spaces or certain characters (%0).",
+                                "# { } ( ) ~ , ^ & - \" ' ` ʹ \\"));
                 return;
             }
-            preferences.setCustomTabsNameAndFields(parts[0], parts[1], i);
 
+            customTabsMap.put(parts[0], FieldFactory.parseFieldList(parts[1]));
         }
-        preferences.purgeSeries(JabRefPreferences.CUSTOM_TAB_NAME, i);
-        preferences.purgeSeries(JabRefPreferences.CUSTOM_TAB_FIELDS, i);
-        preferences.updateEntryEditorTabList();
+
+        preferences.storeEntryEditorTabList(customTabsMap);
     }
 
     public void resetFields() {
-
-        StringBuilder sb = new StringBuilder();
-        Map<String, String> customTabNamesFields = preferences.getCustomTabsNamesAndFields();
-        for (Map.Entry<String, String> entry : customTabNamesFields.entrySet()) {
-            sb.append(entry.getKey());
-            sb.append(':');
-            sb.append(entry.getValue());
-            sb.append('\n');
-        }
-        fieldsText.set(sb.toString());
-
+        // Using default values
+        setFieldsText(preferences.getDefaultTabNamesAndFields());
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index e48add2b08c..36794f64ab7 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -62,7 +62,7 @@ public void execute() {
                             frame.getCurrentBasePanel().cut();
                             break;
                         case PASTE:
-                            // handled by FX in TextInputControl#paste
+                            frame.getCurrentBasePanel().paste();
                             break;
                         case DELETE_ENTRY:
                             frame.getCurrentBasePanel().delete(false);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index f6cbfb7b996..052d5061691 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -152,7 +152,7 @@ public EntryEditor(BasePanel panel, ExternalFileTypes externalFileTypes) {
      */
     private void setupKeyBindings() {
         this.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = entryEditorPreferences.getKeyBindings().mapToKeyBinding(event);
+            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
             if (keyBinding.isPresent()) {
                 switch (keyBinding.get()) {
                     case ENTRY_EDITOR_NEXT_PANEL:
@@ -202,7 +202,7 @@ private void deleteEntry() {
     @FXML
     void generateCiteKeyButton() {
         GenerateBibtexKeySingleAction action = new GenerateBibtexKeySingleAction(getEntry(), databaseContext,
-                dialogService, entryEditorPreferences, undoManager);
+                dialogService, preferencesService, undoManager);
         action.execute();
     }
 
@@ -229,7 +229,7 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
 
         // Other fields
-        entryEditorTabs.add(new OtherFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, entryEditorPreferences.getCustomTabFieldNames(), dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
+        entryEditorTabs.add(new OtherFieldsTab(databaseContext, panel.getSuggestionProviders(), undoManager, dialogService, Globals.prefs, Globals.entryTypesManager, ExternalFileTypes.getInstance(), Globals.TASK_EXECUTOR, Globals.journalAbbreviationLoader));
 
         // General fields from preferences
         for (Map.Entry<String, Set<Field>> tab : entryEditorPreferences.getEntryEditorTabList().entrySet()) {
@@ -242,9 +242,15 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabs.add(new RelatedArticlesTab(this, entryEditorPreferences, dialogService));
 
         // Source tab
-        sourceTab = new SourceTab(databaseContext, undoManager,
-                entryEditorPreferences.getFieldWriterPreferences(),
-                entryEditorPreferences.getImportFormatPreferences(), fileMonitor, dialogService, stateManager, Globals.getKeyPrefs());
+        sourceTab = new SourceTab(
+                databaseContext,
+                undoManager,
+                preferencesService.getFieldWriterPreferences(),
+                preferencesService.getImportFormatPreferences(),
+                fileMonitor,
+                dialogService,
+                stateManager,
+                Globals.getKeyPrefs());
         entryEditorTabs.add(sourceTab);
 
         // LaTeX citations tab
@@ -335,7 +341,7 @@ private void setupToolBar() {
 
         // Add menu for fetching bibliographic information
         ContextMenu fetcherMenu = new ContextMenu();
-        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(entryEditorPreferences.getImportFormatPreferences())) {
+        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(preferencesService.getImportFormatPreferences())) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
             fetcherMenuItem.setOnAction(event -> fetchAndMerge(fetcher));
             fetcherMenu.getItems().add(fetcherMenuItem);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 26c4b48ef2a..82d2fea3b06 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -1,57 +1,43 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jabref.gui.keyboard.KeyBindingRepository;
-import org.jabref.logic.bibtex.FieldWriterPreferences;
-import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
-import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.field.Field;
 
 public class EntryEditorPreferences {
 
     private final Map<String, Set<Field>> entryEditorTabList;
-    private final FieldWriterPreferences fieldWriterPreferences;
-    private final ImportFormatPreferences importFormatPreferences;
-    private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
-    private final List<Field> customTabFieldNames;
+    private boolean shouldOpenOnNewEntry;
     private final boolean shouldShowRecommendationsTab;
     private final boolean isMrdlibAccepted;
-    private boolean showSourceTabByDefault;
-    private final KeyBindingRepository keyBindings;
-    private boolean avoidOverwritingCiteKey;
     private final boolean shouldShowLatexCitationsTab;
+    private boolean showSourceTabByDefault;
+    private boolean enableValidation;
+
+    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
+                                  boolean shouldOpenOnNewEntry,
+                                  boolean shouldShowRecommendationsTab,
+                                  boolean isMrdlibAccepted,
+                                  boolean shouldShowLatexCitationsTab,
+                                  boolean showSourceTabByDefault,
+                                  boolean enableValidation) {
 
-    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList, FieldWriterPreferences fieldWriterPreferences, ImportFormatPreferences importFormatPreferences, List<Field> customTabFieldNames, boolean shouldShowRecommendationsTab, boolean isMrdlibAccepted, boolean shouldShowLatexCitationsTab, boolean showSourceTabByDefault, BibtexKeyPatternPreferences bibtexKeyPatternPreferences, KeyBindingRepository keyBindings, boolean avoidOverwritingCiteKey) {
         this.entryEditorTabList = entryEditorTabList;
-        this.fieldWriterPreferences = fieldWriterPreferences;
-        this.importFormatPreferences = importFormatPreferences;
-        this.customTabFieldNames = customTabFieldNames;
+        this.shouldOpenOnNewEntry = shouldOpenOnNewEntry;
         this.shouldShowRecommendationsTab = shouldShowRecommendationsTab;
         this.isMrdlibAccepted = isMrdlibAccepted;
-        this.showSourceTabByDefault = showSourceTabByDefault;
-        this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
-        this.keyBindings = keyBindings;
-        this.avoidOverwritingCiteKey = avoidOverwritingCiteKey;
         this.shouldShowLatexCitationsTab = shouldShowLatexCitationsTab;
+        this.showSourceTabByDefault = showSourceTabByDefault;
+        this.enableValidation = enableValidation;
     }
 
     public Map<String, Set<Field>> getEntryEditorTabList() {
         return entryEditorTabList;
     }
 
-    public FieldWriterPreferences getFieldWriterPreferences() {
-        return fieldWriterPreferences;
-    }
-
-    public ImportFormatPreferences getImportFormatPreferences() {
-        return importFormatPreferences;
-    }
-
-    public List<Field> getCustomTabFieldNames() {
-        return customTabFieldNames;
+    public boolean shouldOpenOnNewEntry() {
+        return shouldOpenOnNewEntry;
     }
 
     public boolean shouldShowRecommendationsTab() {
@@ -66,27 +52,11 @@ public boolean showSourceTabByDefault() {
         return showSourceTabByDefault;
     }
 
-    public KeyBindingRepository getKeyBindings() {
-        return keyBindings;
-    }
-
-    public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
-        return bibtexKeyPatternPreferences;
-    }
-
-    public boolean isShowSourceTabByDefault() {
-        return showSourceTabByDefault;
-    }
-
-    public void setShowSourceTabByDefault(boolean showSourceTabByDefault) {
-        this.showSourceTabByDefault = showSourceTabByDefault;
-    }
-
     public boolean shouldShowLatexCitationsTab() {
         return shouldShowLatexCitationsTab;
     }
 
-    public boolean avoidOverwritingCiteKey() {
-        return avoidOverwritingCiteKey;
+    public boolean isEnableValidation() {
+        return enableValidation;
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java
deleted file mode 100644
index d9caa0d9c28..00000000000
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jabref.gui.entryeditor;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.preferences.JabRefPreferences;
-
-/**
- * Class for creating the information about customizable entry editor tabs.
- */
-public final class EntryEditorTabList {
-
-    private EntryEditorTabList() {
-
-    }
-
-    public static Map<String, Set<Field>> create(JabRefPreferences preferences) {
-        Map<String, Set<Field>> tabs = new LinkedHashMap<>();
-        int i = 0;
-        String name;
-        if (preferences.hasKey(JabRefPreferences.CUSTOM_TAB_NAME + 0)) {
-            // The user has modified from the default values:
-            while (preferences.hasKey(JabRefPreferences.CUSTOM_TAB_NAME + i)) {
-                name = preferences.get(JabRefPreferences.CUSTOM_TAB_NAME + i);
-                Set<Field> entry = FieldFactory.parseFieldList(preferences.get(JabRefPreferences.CUSTOM_TAB_FIELDS + i));
-                tabs.put(name, entry);
-                i++;
-            }
-        } else {
-            // Nothing set, so we use the default values:
-            while (preferences.get(JabRefPreferences.CUSTOM_TAB_NAME + "_def" + i) != null) {
-                name = preferences.get(JabRefPreferences.CUSTOM_TAB_NAME + "_def" + i);
-                Set<Field> entry = FieldFactory.parseFieldList(preferences.get(JabRefPreferences.CUSTOM_TAB_FIELDS + "_def" + i));
-                tabs.put(name, entry);
-                i++;
-            }
-        }
-        return tabs;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index cf4a9b8323d..165347ff370 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -34,10 +34,27 @@ public class OtherFieldsTab extends FieldsEditorTab {
     private final List<Field> customTabFieldNames;
     private final BibEntryTypesManager entryTypesManager;
 
-    public OtherFieldsTab(BibDatabaseContext databaseContext, SuggestionProviders suggestionProviders, UndoManager undoManager, List<Field> customTabFieldNames, DialogService dialogService, JabRefPreferences preferences, BibEntryTypesManager entryTypesManager, ExternalFileTypes externalFileTypes, TaskExecutor taskExecutor, JournalAbbreviationLoader journalAbbreviationLoader) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, externalFileTypes, taskExecutor, journalAbbreviationLoader);
+    public OtherFieldsTab(BibDatabaseContext databaseContext,
+                          SuggestionProviders suggestionProviders,
+                          UndoManager undoManager,
+                          DialogService dialogService,
+                          JabRefPreferences preferences,
+                          BibEntryTypesManager entryTypesManager,
+                          ExternalFileTypes externalFileTypes,
+                          TaskExecutor taskExecutor,
+                          JournalAbbreviationLoader journalAbbreviationLoader) {
+        super(false,
+                databaseContext,
+                suggestionProviders,
+                undoManager,
+                dialogService,
+                preferences, // ToDo: Still uses JabRefPreferences instead of PreferencesService
+                externalFileTypes,
+                taskExecutor,
+                journalAbbreviationLoader);
+
         this.entryTypesManager = entryTypesManager;
-        this.customTabFieldNames = customTabFieldNames;
+        this.customTabFieldNames = preferences.getAllDefaultTabFieldNames();
 
         setText(Localization.lang("Other fields"));
         setTooltip(new Tooltip(Localization.lang("Show remaining fields")));
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 47d93fad9cb..c461dc11c1b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -69,8 +69,8 @@ public class SourceTab extends EntryEditorTab {
     private final DialogService dialogService;
     private final StateManager stateManager;
     private Optional<Pattern> searchHighlightPattern = Optional.empty();
-    private final CodeArea codeArea;
-    private KeyBindingRepository keyBindingRepository;
+    private final KeyBindingRepository keyBindingRepository;
+    private CodeArea codeArea;
 
     private BibEntry previousEntry;
 
@@ -78,7 +78,9 @@ private class EditAction extends SimpleCommand {
 
         private final StandardActions command;
 
-        public EditAction(StandardActions command) { this.command = command; }
+        public EditAction(StandardActions command) {
+            this.command = command;
+        }
 
         @Override
         public void execute() {
@@ -112,11 +114,6 @@ public SourceTab(BibDatabaseContext bibDatabaseContext, CountingUndoManager undo
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.keyBindingRepository = keyBindingRepository;
-        this.codeArea = new CodeArea();
-
-        setupSourceEditor();
-        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
-        this.setContent(scrollableCodeArea);
 
         stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
             searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
@@ -172,6 +169,7 @@ public Point2D getTextLocation(int offset) {
     }
 
     private void setupSourceEditor() {
+        codeArea = new CodeArea();
         codeArea.setWrapText(true);
         codeArea.setInputMethodRequests(new InputMethodRequestsObject());
         codeArea.setOnInputMethodTextChanged(event -> {
@@ -200,7 +198,7 @@ private void setupSourceEditor() {
             ValidationStatus sourceValidationStatus = sourceValidator.getValidationStatus();
             if (!sourceValidationStatus.isValid()) {
                 sourceValidationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+                        dialogService.showErrorDialogAndWait(message.getMessage()));
             }
         });
 
@@ -209,6 +207,8 @@ private void setupSourceEditor() {
                 storeSource(currentEntry, codeArea.textProperty().getValue());
             }
         });
+        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
+        this.setContent(scrollableCodeArea);
     }
 
     @Override
@@ -218,6 +218,10 @@ public boolean shouldShow(BibEntry entry) {
 
     private void updateCodeArea() {
         DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
+            if (codeArea == null) {
+                setupSourceEditor();
+            }
+
             codeArea.clear();
             try {
                 codeArea.appendText(getSourceString(currentEntry, mode, fieldWriterPreferences));
@@ -233,7 +237,7 @@ private void updateCodeArea() {
 
     @Override
     protected void bindToEntry(BibEntry entry) {
-        if (previousEntry != null) {
+        if (previousEntry != null && codeArea != null) {
             storeSource(previousEntry, codeArea.textProperty().getValue());
         }
         this.previousEntry = entry;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
index a699f15f20c..eb21c30ea53 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
@@ -10,7 +10,7 @@
 
 import org.jabref.JabRefGUI;
 import org.jabref.gui.AbstractViewModel;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -28,11 +28,11 @@ public class AbstractEditorViewModel extends AbstractViewModel {
     protected final Field field;
     protected StringProperty text = new SimpleStringProperty("");
     protected BibEntry entry;
-    private final AutoCompleteSuggestionProvider<?> suggestionProvider;
+    private final SuggestionProvider<?> suggestionProvider;
     private final CompositeValidator fieldValidator;
     private ObjectBinding<String> fieldBinding;
 
-    public AbstractEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public AbstractEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.field = field;
         this.suggestionProvider = suggestionProvider;
 
@@ -72,6 +72,6 @@ public void bindToEntry(BibEntry entry) {
     }
 
     public Collection<?> complete(AutoCompletionBinding.ISuggestionRequest request) {
-        return suggestionProvider.call(request);
+        return suggestionProvider.provideSuggestions(request);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
index 89737ceaa0f..be51bdf35e8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditor.java
@@ -10,7 +10,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -26,9 +26,16 @@ public class BibtexKeyEditor extends HBox implements FieldEditorFX {
     @FXML private Button generateCiteKeyButton;
     @FXML private EditorTextField textField;
 
-    public BibtexKeyEditor(Field field, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
+    public BibtexKeyEditor(Field field, JabRefPreferences preferences, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
         this.preferences = preferences;
-        this.viewModel = new BibtexKeyEditorViewModel(field, suggestionProvider, fieldCheckers, preferences.getEntryEditorPreferences(), databaseContext, undoManager, dialogService);
+        this.viewModel = new BibtexKeyEditorViewModel(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                databaseContext,
+                undoManager,
+                dialogService);
 
         ViewLoader.view(this)
                   .root(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java
index 4da93f60b87..c4ba0325c26 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java
@@ -3,30 +3,30 @@
 import javax.swing.undo.UndoManager;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.bibtexkeypattern.GenerateBibtexKeySingleAction;
-import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.commands.Command;
 
 public class BibtexKeyEditorViewModel extends AbstractEditorViewModel {
-    private final EntryEditorPreferences preferences;
+    private final PreferencesService preferencesService;
     private final BibDatabaseContext databaseContext;
     private final UndoManager undoManager;
     private final DialogService dialogService;
 
-    public BibtexKeyEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, EntryEditorPreferences preferences, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
+    public BibtexKeyEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, PreferencesService preferencesService, BibDatabaseContext databaseContext, UndoManager undoManager, DialogService dialogService) {
         super(field, suggestionProvider, fieldCheckers);
-        this.preferences = preferences;
+        this.preferencesService = preferencesService;
         this.databaseContext = databaseContext;
         this.undoManager = undoManager;
         this.dialogService = dialogService;
     }
 
     public Command getGenerateCiteKeyCommand() {
-        return new GenerateBibtexKeySingleAction(entry, databaseContext, dialogService, preferences, undoManager);
+        return new GenerateBibtexKeySingleAction(entry, databaseContext, dialogService, preferencesService, undoManager);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
index c6d8a8a58e6..cd8ad8785ca 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
@@ -6,7 +6,7 @@
 import javafx.scene.Parent;
 import javafx.scene.layout.HBox;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.component.TemporalAccessorPicker;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
@@ -19,7 +19,7 @@ public class DateEditor extends HBox implements FieldEditorFX {
     @FXML private DateEditorViewModel viewModel;
     @FXML private TemporalAccessorPicker datePicker;
 
-    public DateEditor(Field field, DateTimeFormatter dateFormatter, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public DateEditor(Field field, DateTimeFormatter dateFormatter, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new DateEditorViewModel(field, suggestionProvider, dateFormatter, fieldCheckers);
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
index 7dc8f3735a8..96ffe10c09e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
@@ -6,7 +6,7 @@
 
 import javafx.util.StringConverter;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.Date;
 import org.jabref.model.entry.field.Field;
@@ -15,7 +15,7 @@
 public class DateEditorViewModel extends AbstractEditorViewModel {
     private final DateTimeFormatter dateFormatter;
 
-    public DateEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, DateTimeFormatter dateFormatter, FieldCheckers fieldCheckers) {
+    public DateEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, DateTimeFormatter dateFormatter, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.dateFormatter = dateFormatter;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
index b11500977b9..1de303d3f8d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
@@ -12,7 +12,7 @@ public class EditorTypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public EditorTypeEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public EditorTypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("editor", Localization.lang("Editor"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 77c02ef2e2d..de6b6bd3259 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -8,8 +8,8 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.ContentSelectorSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -43,7 +43,7 @@ public static FieldEditorFX getForField(final Field field,
                                             final UndoManager undoManager) {
         final Set<FieldProperty> fieldProperties = field.getProperties();
 
-        final AutoCompleteSuggestionProvider<?> suggestionProvider = getSuggestionProvider(field, suggestionProviders, databaseContext.getMetaData());
+        final SuggestionProvider<?> suggestionProvider = getSuggestionProvider(field, suggestionProviders, databaseContext.getMetaData());
 
         final FieldCheckers fieldCheckers = new FieldCheckers(
                 databaseContext,
@@ -64,7 +64,7 @@ public static FieldEditorFX getForField(final Field field,
             return new JournalEditor(field, journalAbbreviationRepository, preferences, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.DOI) || fieldProperties.contains(FieldProperty.EPRINT) || fieldProperties.contains(FieldProperty.ISBN)) {
             return new IdentifierEditor(field, taskExecutor, dialogService, suggestionProvider, fieldCheckers, preferences);
-        } else if (field == InternalField.OWNER) {
+        } else if (field == StandardField.OWNER) {
             return new OwnerEditor(field, preferences, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.FILE_EDITOR)) {
             return new LinkedFilesEditor(field, dialogService, databaseContext, taskExecutor, suggestionProvider, fieldCheckers, preferences);
@@ -101,14 +101,14 @@ public static FieldEditorFX getForField(final Field field,
     }
 
     @SuppressWarnings("unchecked")
-    private static AutoCompleteSuggestionProvider<?> getSuggestionProvider(Field field, SuggestionProviders suggestionProviders, MetaData metaData) {
-        AutoCompleteSuggestionProvider<?> suggestionProvider = suggestionProviders.getForField(field);
+    private static SuggestionProvider<?> getSuggestionProvider(Field field, SuggestionProviders suggestionProviders, MetaData metaData) {
+        SuggestionProvider<?> suggestionProvider = suggestionProviders.getForField(field);
 
         List<String> contentSelectorValues = metaData.getContentSelectorValuesForField(field);
         if (!contentSelectorValues.isEmpty()) {
             // Enrich auto completion by content selector values
             try {
-                return new ContentSelectorSuggestionProvider((AutoCompleteSuggestionProvider<String>) suggestionProvider, contentSelectorValues);
+                return new ContentSelectorSuggestionProvider((SuggestionProvider<String>) suggestionProvider, contentSelectorValues);
             } catch (ClassCastException exception) {
                 LOGGER.error("Content selectors are only supported for normal fields with string-based auto completion.");
                 return suggestionProvider;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
index ea4526faa1f..ae3852c3aae 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -216,18 +216,18 @@ public String getDescription(Field field) {
                     return Localization.lang("Citation keys of other entries which have a relationship to this entry.");
                 case XREF:
                     return Localization.lang("This field is an alternative cross-referencing mechanism. It differs from \"Crossref\" in that the child entry will not inherit any data from the parent entry specified in the \"Xref\" field.");
-            }
-        } else if (field instanceof InternalField) {
-            InternalField internalField = (InternalField) field;
-            switch (internalField) {
+                case GROUPS:
+                    return Localization.lang("Name(s) of the (manual) groups the entry belongs to.");
                 case OWNER:
                     return Localization.lang("Owner/creator of this entry.");
                 case TIMESTAMP:
                     return Localization.lang("Timestamp of this entry, when it has been created or last modified.");
+            }
+        } else if (field instanceof InternalField) {
+            InternalField internalField = (InternalField) field;
+            switch (internalField) {
                 case KEY_FIELD:
                     return Localization.lang("Key by which the work may be cited.");
-                case GROUPS:
-                    return Localization.lang("Name(s) of the (manual) groups the entry belongs to.");
             }
         } else if (field instanceof SpecialField) {
             SpecialField specialField = (SpecialField) field;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
index 090f49eeba3..0a71d908215 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
@@ -12,7 +12,7 @@ public class GenderEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public GenderEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public GenderEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("sf", Localization.lang("Female name"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
index 9a3262dee69..cbc572f5216 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditor.java
@@ -10,7 +10,7 @@
 import javafx.scene.layout.HBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -30,7 +30,7 @@ public class IdentifierEditor extends HBox implements FieldEditorFX {
     @FXML private Button lookupIdentifierButton;
     private Optional<BibEntry> entry;
 
-    public IdentifierEditor(Field field, TaskExecutor taskExecutor, DialogService dialogService, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
+    public IdentifierEditor(Field field, TaskExecutor taskExecutor, DialogService dialogService, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
         this.viewModel = new IdentifierEditorViewModel(field, suggestionProvider, taskExecutor, dialogService, fieldCheckers);
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
index caf29158122..c35c1a5d9b3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModel.java
@@ -10,7 +10,7 @@
 
 import org.jabref.JabRefGUI;
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.mergeentries.FetchAndMergeEntry;
 import org.jabref.gui.util.BackgroundTask;
@@ -33,7 +33,7 @@ public class IdentifierEditorViewModel extends AbstractEditorViewModel {
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
 
-    public IdentifierEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, TaskExecutor taskExecutor, DialogService dialogService, FieldCheckers fieldCheckers) {
+    public IdentifierEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, TaskExecutor taskExecutor, DialogService dialogService, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         this.taskExecutor = taskExecutor;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
index f4d46b93262..9c9bc5ee9c8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -4,8 +4,8 @@
 import javafx.scene.Parent;
 import javafx.scene.layout.HBox;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
@@ -20,7 +20,7 @@ public class JournalEditor extends HBox implements FieldEditorFX {
     @FXML private JournalEditorViewModel viewModel;
     @FXML private EditorTextField textField;
 
-    public JournalEditor(Field field, JournalAbbreviationRepository journalAbbreviationRepository, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public JournalEditor(Field field, JournalAbbreviationRepository journalAbbreviationRepository, JabRefPreferences preferences, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new JournalEditorViewModel(field, suggestionProvider, journalAbbreviationRepository, fieldCheckers);
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
index 4f3f20e94f6..e07401b91e2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.entry.field.Field;
@@ -11,7 +11,7 @@
 public class JournalEditorViewModel extends AbstractEditorViewModel {
     private final JournalAbbreviationRepository journalAbbreviationRepository;
 
-    public JournalEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, JournalAbbreviationRepository journalAbbreviationRepository, FieldCheckers fieldCheckers) {
+    public JournalEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, JournalAbbreviationRepository journalAbbreviationRepository, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         this.journalAbbreviationRepository = journalAbbreviationRepository;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
index 02b885c80d3..4af7971c052 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.JabRefPreferences;
 
 public class KeywordsEditor extends SimpleEditor implements FieldEditorFX {
 
-    public KeywordsEditor(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
+    public KeywordsEditor(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
         super(field, suggestionProvider, fieldCheckers, preferences);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
index f510063ee90..9568cfce925 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
@@ -5,8 +5,8 @@
 import javafx.scene.Parent;
 import javafx.scene.layout.HBox;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.component.TagBar;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseContext;
@@ -23,12 +23,12 @@ public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
     @FXML
     private TagBar<ParsedEntryLink> linkedEntriesBar;
 
-    public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers);
 
         ViewLoader.view(this)
-                .root(this)
-                .load();
+                  .root(this)
+                  .load();
 
         linkedEntriesBar.setFieldProperties(field.getProperties());
         linkedEntriesBar.setStringConverter(viewModel.getStringConverter());
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
index 19af58758fe..425f87b6034 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
@@ -8,7 +8,7 @@
 import javafx.collections.FXCollections;
 import javafx.util.StringConverter;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseContext;
@@ -24,7 +24,7 @@ public class LinkedEntriesEditorViewModel extends AbstractEditorViewModel {
     private final BibDatabaseContext databaseContext;
     private final ListProperty<ParsedEntryLink> linkedEntries;
 
-    public LinkedEntriesEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, BibDatabaseContext databaseContext, FieldCheckers fieldCheckers) {
+    public LinkedEntriesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, BibDatabaseContext databaseContext, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         this.databaseContext = databaseContext;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 7dbacc13bc8..56b1086303a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -28,7 +28,7 @@
 import org.jabref.Globals;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.copyfiles.CopySingleFileAction;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
@@ -54,7 +54,7 @@ public class LinkedFilesEditor extends HBox implements FieldEditorFX {
     private final BibDatabaseContext databaseContext;
     private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
 
-    public LinkedFilesEditor(Field field, DialogService dialogService, BibDatabaseContext databaseContext, TaskExecutor taskExecutor, AutoCompleteSuggestionProvider<?> suggestionProvider,
+    public LinkedFilesEditor(Field field, DialogService dialogService, BibDatabaseContext databaseContext, TaskExecutor taskExecutor, SuggestionProvider<?> suggestionProvider,
                              FieldCheckers fieldCheckers,
                              JabRefPreferences preferences) {
         this.viewModel = new LinkedFilesEditorViewModel(field, suggestionProvider, dialogService, databaseContext, taskExecutor, fieldCheckers, preferences);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index 471af98aa2f..68413ff3019 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -17,7 +17,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.externalfiletype.CustomExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -51,7 +51,7 @@ public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
     private final PreferencesService preferences;
     private final ExternalFileTypes externalFileTypes = ExternalFileTypes.getInstance();
 
-    public LinkedFilesEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider,
+    public LinkedFilesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider,
                                       DialogService dialogService,
                                       BibDatabaseContext databaseContext,
                                       TaskExecutor taskExecutor,
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
index 9fce68893e1..8eeae4fe2e4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
@@ -5,7 +5,7 @@
 
 import javafx.util.StringConverter;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
@@ -20,7 +20,7 @@ public abstract class MapBasedEditorViewModel<T> extends OptionEditorViewModel<T
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MapBasedEditorViewModel.class);
 
-    public MapBasedEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public MapBasedEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
index 3132f8e874d..0e13805984a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
@@ -5,7 +5,7 @@
 
 import javafx.util.StringConverter;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.Month;
@@ -15,7 +15,7 @@
 public class MonthEditorViewModel extends OptionEditorViewModel<Month> {
     private BibDatabaseMode databaseMode;
 
-    public MonthEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, BibDatabaseMode databaseMode, FieldCheckers fieldCheckers) {
+    public MonthEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, BibDatabaseMode databaseMode, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.databaseMode = databaseMode;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
index b72a90bf1e6..c98d7a0d28c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
@@ -4,13 +4,13 @@
 
 import javafx.util.StringConverter;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
 public abstract class OptionEditorViewModel<T> extends AbstractEditorViewModel {
 
-    public OptionEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public OptionEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
index 0f3660e6e35..1a40dbb6e08 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
@@ -5,7 +5,7 @@
 import javafx.scene.Parent;
 import javafx.scene.layout.HBox;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -18,7 +18,7 @@ public class OwnerEditor extends HBox implements FieldEditorFX {
     @FXML private OwnerEditorViewModel viewModel;
     @FXML private EditorTextArea textArea;
 
-    public OwnerEditor(Field field, JabRefPreferences preferences, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public OwnerEditor(Field field, JabRefPreferences preferences, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         this.viewModel = new OwnerEditorViewModel(field, suggestionProvider, preferences, fieldCheckers);
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
index 171188ad71b..2a1f506ec36 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.JabRefPreferences;
@@ -8,7 +8,7 @@
 public class OwnerEditorViewModel extends AbstractEditorViewModel {
     private final JabRefPreferences preferences;
 
-    public OwnerEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, JabRefPreferences preferences, FieldCheckers fieldCheckers) {
+    public OwnerEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, JabRefPreferences preferences, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.preferences = preferences;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
index 218c37641c9..991f3d2ac96 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
@@ -12,7 +12,7 @@ public class PaginationEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public PaginationEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public PaginationEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("page", Localization.lang("Page"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
index d7410aabf19..89b586c253c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
@@ -12,7 +12,7 @@ public class PatentTypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(12);
 
-    public PatentTypeEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public PatentTypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("patent", Localization.lang("Patent"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index 5faa0dbb26d..6b3b9dc1680 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -4,8 +4,8 @@
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.gui.util.uithreadaware.UiThreadStringProperty;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -20,7 +20,7 @@ public class PersonsEditor extends HBox implements FieldEditorFX {
     private final UiThreadStringProperty decoratedStringProperty;
 
     public PersonsEditor(final Field field,
-                         final AutoCompleteSuggestionProvider<?> suggestionProvider,
+                         final SuggestionProvider<?> suggestionProvider,
                          final JabRefPreferences preferences,
                          final FieldCheckers fieldCheckers,
                          final boolean isSingleLine) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
index c85197a8aca..e1354a1ac5f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
@@ -6,9 +6,9 @@
 
 import org.jabref.gui.autocompleter.AppendPersonNamesStrategy;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionStrategy;
 import org.jabref.gui.autocompleter.PersonNameStringConverter;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.field.Field;
@@ -19,7 +19,7 @@ public class PersonsEditorViewModel extends AbstractEditorViewModel {
 
     private final AutoCompletePreferences preferences;
 
-    public PersonsEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, AutoCompletePreferences preferences, FieldCheckers fieldCheckers) {
+    public PersonsEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, AutoCompletePreferences preferences, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.preferences = preferences;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
index a8e2e91a372..10a0882a91e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
@@ -5,9 +5,9 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.ContentSelectorSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
@@ -20,7 +20,7 @@ public class SimpleEditor extends HBox implements FieldEditorFX {
     private final TextInputControl textInput;
 
     public SimpleEditor(final Field field,
-                        final AutoCompleteSuggestionProvider<?> suggestionProvider,
+                        final SuggestionProvider<?> suggestionProvider,
                         final FieldCheckers fieldCheckers,
                         final JabRefPreferences preferences,
                         final boolean isSingleLine) {
@@ -45,7 +45,7 @@ public SimpleEditor(final Field field,
     }
 
     public SimpleEditor(final Field field,
-                        final AutoCompleteSuggestionProvider<?> suggestionProvider,
+                        final SuggestionProvider<?> suggestionProvider,
                         final FieldCheckers fieldCheckers,
                         final JabRefPreferences preferences) {
         this(field, suggestionProvider, fieldCheckers, preferences, false);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
index cc5b9176e4a..52b4f6b2f07 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.fieldeditors;
 
 import org.jabref.gui.autocompleter.AppendWordsStrategy;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionStrategy;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
 public class SimpleEditorViewModel extends AbstractEditorViewModel {
 
-    public SimpleEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public SimpleEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
index 72b16eda2c9..c4f64880e55 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
@@ -12,7 +12,7 @@ public class TypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(8);
 
-    public TypeEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public TypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("mathesis", Localization.lang("Master's thesis"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index 270770a2ea1..b4d53a6d6e0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -10,7 +10,7 @@
 import javafx.scene.layout.HBox;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
 import org.jabref.logic.formatter.bibtexfields.TrimWhitespaceFormatter;
@@ -26,7 +26,7 @@ public class UrlEditor extends HBox implements FieldEditorFX {
     @FXML private final UrlEditorViewModel viewModel;
     @FXML private EditorTextArea textArea;
 
-    public UrlEditor(Field field, DialogService dialogService, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
+    public UrlEditor(Field field, DialogService dialogService, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, JabRefPreferences preferences) {
         this.viewModel = new UrlEditorViewModel(field, suggestionProvider, dialogService, fieldCheckers);
 
         ViewLoader.view(this)
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
index be2a3702c34..76f6f465ef0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
@@ -6,7 +6,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.logic.l10n.Localization;
@@ -19,7 +19,7 @@ public class UrlEditorViewModel extends AbstractEditorViewModel {
     private DialogService dialogService;
     private BooleanProperty validUrlIsNotPresent = new SimpleBooleanProperty(true);
 
-    public UrlEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, DialogService dialogService, FieldCheckers fieldCheckers) {
+    public UrlEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, DialogService dialogService, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
         this.dialogService = dialogService;
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
index b4d3c81dafc..a1210b1d2eb 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
@@ -1,6 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.Field;
 
@@ -11,7 +11,7 @@ public class YesNoEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(2);
 
-    public YesNoEditorViewModel(Field field, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public YesNoEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(field, suggestionProvider, fieldCheckers);
 
         itemMap.put("yes", "Yes");
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 9d11fc25bb4..d6523a97c45 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -142,6 +142,7 @@ public void initialize() {
             validationVisualizer.initVisualization(viewModel.keywordRegexValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordSearchTermEmptyValidationStatus(), keywordGroupSearchTerm);
             validationVisualizer.initVisualization(viewModel.keywordFieldEmptyValidationStatus(), keywordGroupSearchField);
+            nameField.requestFocus();
         });
 
         // Binding to the button throws a NPE, since it doesn't exist yet. Working around.
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index 9397f26de16..3db6023abe8 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -19,27 +19,53 @@
 import org.jabref.model.entry.FileFieldParser;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.FieldProperty;
+import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.GroupTreeNode;
 
 import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.monadic.MonadicBinding;
 
 public class BibEntryTableViewModel {
     private final BibEntry entry;
+    private final BibDatabase database;
+    private final MainTableNameFormatter nameFormatter;
+    private final Map<OrFields, ObservableValue<String>> fieldValues = new HashMap<>();
+    private final Map<SpecialField, ObservableValue<Optional<SpecialFieldValueViewModel>>> specialFieldValues = new HashMap<>();
+    private final MonadicBinding<List<LinkedFile>> linkedFiles;
+    private final ObjectBinding<Map<Field, String>> linkedIdentifiers;
+    private final ObservableValue<List<AbstractGroup>> matchedGroups;
 
-    public BibEntryTableViewModel(BibEntry entry) {
+    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext database, MainTableNameFormatter nameFormatter) {
         this.entry = entry;
+        this.database = database.getDatabase();
+        this.nameFormatter = nameFormatter;
+
+        this.linkedFiles = EasyBind.map(getField(StandardField.FILE), FileFieldParser::parse);
+        this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
+        this.matchedGroups = createMatchedGroupsBinding(database);
     }
 
-    public BibEntry getEntry() {
-        return entry;
+    private ObjectBinding<Map<Field, String>> createLinkedIdentifiersBinding(BibEntry entry) {
+        return Bindings.createObjectBinding(() -> {
+                    Map<Field, String> identifiers = new HashMap<>();
+                    entry.getField(StandardField.URL).ifPresent(value -> identifiers.put(StandardField.URL, value));
+                    entry.getField(StandardField.DOI).ifPresent(value -> identifiers.put(StandardField.DOI, value));
+                    entry.getField(StandardField.URI).ifPresent(value -> identifiers.put(StandardField.URI, value));
+                    entry.getField(StandardField.EPRINT).ifPresent(value -> identifiers.put(StandardField.EPRINT, value));
+                    return identifiers;
+                },
+                getEntry().getFieldBinding(StandardField.URL),
+                getEntry().getFieldBinding(StandardField.DOI),
+                getEntry().getFieldBinding(StandardField.URI),
+                getEntry().getFieldBinding(StandardField.EPRINT));
     }
 
-    public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
-        return entry.getResolvedFieldOrAliasLatexFree(field, database);
+    public BibEntry getEntry() {
+        return entry;
     }
 
     public ObjectBinding<String> getField(Field field) {
@@ -47,32 +73,32 @@ public ObjectBinding<String> getField(Field field) {
     }
 
     public ObservableValue<Optional<SpecialFieldValueViewModel>> getSpecialField(SpecialField field) {
-        return EasyBind.map(getField(field), value -> field.parseValue(value).map(SpecialFieldValueViewModel::new));
+        ObservableValue<Optional<SpecialFieldValueViewModel>> value = specialFieldValues.get(field);
+        if (value != null) {
+            return value;
+        } else {
+            value = EasyBind.map(getField(field), fieldValue -> field.parseValue(fieldValue).map(SpecialFieldValueViewModel::new));
+            specialFieldValues.put(field, value);
+            return value;
+        }
     }
 
     public ObservableValue<List<LinkedFile>> getLinkedFiles() {
-        return EasyBind.map(getField(StandardField.FILE), FileFieldParser::parse);
+        return linkedFiles;
     }
 
     public ObservableValue<Map<Field, String>> getLinkedIdentifiers() {
-        return Bindings.createObjectBinding(() -> {
-                    Map<Field, String> linkedIdentifiers = new HashMap<>();
-                    entry.getField(StandardField.URL).ifPresent(value -> linkedIdentifiers.put(StandardField.URL, value));
-                    entry.getField(StandardField.DOI).ifPresent(value -> linkedIdentifiers.put(StandardField.DOI, value));
-                    entry.getField(StandardField.URI).ifPresent(value -> linkedIdentifiers.put(StandardField.URI, value));
-                    entry.getField(StandardField.EPRINT).ifPresent(value -> linkedIdentifiers.put(StandardField.EPRINT, value));
-                    return linkedIdentifiers;
-                },
-                getEntry().getFieldBinding(StandardField.URL),
-                getEntry().getFieldBinding(StandardField.DOI),
-                getEntry().getFieldBinding(StandardField.URI),
-                getEntry().getFieldBinding(StandardField.EPRINT));
+        return linkedIdentifiers;
+    }
+
+    public ObservableValue<List<AbstractGroup>> getMatchedGroups() {
+        return matchedGroups;
     }
 
-    public ObservableValue<List<AbstractGroup>> getMatchedGroups(BibDatabaseContext database) {
+    private ObservableValue<List<AbstractGroup>> createMatchedGroupsBinding(BibDatabaseContext database) {
         Optional<GroupTreeNode> root = database.getMetaData().getGroups();
         if (root.isPresent()) {
-            return EasyBind.map(entry.getFieldBinding(InternalField.GROUPS), field -> {
+            return EasyBind.map(entry.getFieldBinding(StandardField.GROUPS), field -> {
                 List<AbstractGroup> groups = root.get().getMatchingGroups(entry)
                                                  .stream()
                                                  .map(GroupTreeNode::getGroup)
@@ -83,4 +109,33 @@ public ObservableValue<List<AbstractGroup>> getMatchedGroups(BibDatabaseContext
         }
         return new SimpleObjectProperty<>(Collections.emptyList());
     }
+
+    public ObservableValue<String> getFields(OrFields fields) {
+        ObservableValue<String> value = fieldValues.get(fields);
+        if (value != null) {
+            return value;
+        } else {
+            value = Bindings.createStringBinding(() -> {
+                boolean isName = false;
+
+                Optional<String> content = Optional.empty();
+                for (Field field : fields) {
+                    content = entry.getResolvedFieldOrAliasLatexFree(field, database);
+                    if (content.isPresent()) {
+                        isName = field.getProperties().contains(FieldProperty.PERSON_NAMES);
+                        break;
+                    }
+                }
+
+                String result = content.orElse(null);
+                if (isName) {
+                    return nameFormatter.formatName(result);
+                } else {
+                    return result;
+                }
+            }, entry.getObservables());
+            fieldValues.put(fields, value);
+            return value;
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/FieldColumn.java b/src/main/java/org/jabref/gui/maintable/FieldColumn.java
index cc221fcf722..fac40ce2d87 100644
--- a/src/main/java/org/jabref/gui/maintable/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/FieldColumn.java
@@ -1,15 +1,7 @@
 package org.jabref.gui.maintable;
 
-import java.util.Optional;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
 import javafx.beans.value.ObservableValue;
 
-import org.jabref.Globals;
-import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.OrFields;
 
 /**
@@ -17,20 +9,14 @@
  */
 public class FieldColumn extends MainTableColumn<String> {
 
-    private final OrFields bibtexFields;
-
-    private final Optional<BibDatabase> database;
-
-    private final MainTableNameFormatter nameFormatter;
+    private final OrFields fields;
 
-    public FieldColumn(MainTableColumnModel model, OrFields bibtexFields, BibDatabase database) {
+    public FieldColumn(MainTableColumnModel model, OrFields fields) {
         super(model);
-        this.bibtexFields = bibtexFields;
-        this.database = Optional.of(database);
-        this.nameFormatter = new MainTableNameFormatter(Globals.prefs);
+        this.fields = fields;
 
         setText(getDisplayName());
-        setCellValueFactory(param -> getColumnValue(param.getValue()));
+        setCellValueFactory(param -> getFieldValue(param.getValue()));
     }
 
     /**
@@ -39,35 +25,15 @@ public FieldColumn(MainTableColumnModel model, OrFields bibtexFields, BibDatabas
      * @return name to be displayed. null if field is empty.
      */
     @Override
-    public String getDisplayName() { return bibtexFields.getDisplayName(); }
-
-    private ObservableValue<String> getColumnValue(BibEntryTableViewModel entry) {
-        if (bibtexFields.isEmpty()) {
-            return null;
-        }
-
-        ObjectBinding[] dependencies = bibtexFields.stream().map(entry::getField).toArray(ObjectBinding[]::new);
-        return Bindings.createStringBinding(() -> computeText(entry), dependencies);
+    public String getDisplayName() {
+        return fields.getDisplayName();
     }
 
-    private String computeText(BibEntryTableViewModel entry) {
-        boolean isNameColumn = false;
-
-        Optional<String> content = Optional.empty();
-        for (Field field : bibtexFields) {
-            content = entry.getResolvedFieldOrAlias(field, database.orElse(null));
-            if (content.isPresent()) {
-                isNameColumn = field.getProperties().contains(FieldProperty.PERSON_NAMES);
-                break;
-            }
-        }
-
-        String result = content.orElse(null);
-
-        if (isNameColumn) {
-            return nameFormatter.formatName(result);
+    private ObservableValue<String> getFieldValue(BibEntryTableViewModel entry) {
+        if (fields.isEmpty()) {
+            return null;
         } else {
-            return result;
+            return entry.getFields(fields);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index a821e343d01..2327da419a2 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -160,7 +160,7 @@ private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableC
         column.getStyleClass().add(STYLE_ICON_COLUMN);
         setExactWidth(column, ColumnPreferences.ICON_COLUMN_WIDTH);
         column.setResizable(false);
-        column.setCellValueFactory(cellData -> cellData.getValue().getMatchedGroups(database));
+        column.setCellValueFactory(cellData -> cellData.getValue().getMatchedGroups());
         new ValueTableCellFactory<BibEntryTableViewModel, List<AbstractGroup>>()
                 .withGraphic(this::createGroupColorRegion)
                 .install(column);
@@ -207,8 +207,8 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
      */
     private TableColumn<BibEntryTableViewModel, ?> createFieldColumn(MainTableColumnModel columnModel) {
         FieldColumn column = new FieldColumn(columnModel,
-                FieldFactory.parseOrFields(columnModel.getQualifier()),
-                database.getDatabase());
+                FieldFactory.parseOrFields(columnModel.getQualifier())
+        );
         new ValueTableCellFactory<BibEntryTableViewModel, String>()
                 .withText(text -> text)
                 .install(column);
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 192dd715f4f..c9605508f03 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -27,7 +27,8 @@ public class MainTableDataModel {
     public MainTableDataModel(BibDatabaseContext context) {
         ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
 
-        ObservableList<BibEntryTableViewModel> entriesViewModel = BindingsHelper.mapBacked(allEntries, BibEntryTableViewModel::new);
+        MainTableNameFormatter nameFormatter = new MainTableNameFormatter(Globals.prefs);
+        ObservableList<BibEntryTableViewModel> entriesViewModel = BindingsHelper.mapBacked(allEntries, entry -> new BibEntryTableViewModel(entry, context, nameFormatter));
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered.predicateProperty().bind(
diff --git a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
index 315148e269b..52adaabd610 100644
--- a/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java
@@ -11,10 +11,9 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
-import org.jabref.preferences.JabRefPreferences;
-
-import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
-import static org.jabref.gui.autocompleter.AutoCompleteFirstNameMode.ONLY_FULL;
+import org.jabref.gui.entryeditor.EntryEditorPreferences;
+import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.preferences.PreferencesService;
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
 
@@ -33,37 +32,42 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
     private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
 
-    private AutoCompletePreferences autoCompletePreferences;
-
     private final DialogService dialogService;
-    private final JabRefPreferences preferences;
+    private final PreferencesService preferencesService;
+    private final EntryEditorPreferences initialEntryEditorPreferences;
+    private final AutoCompletePreferences initialAutoCompletePreferences;
 
-    public EntryEditorTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+    public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
-        this.preferences = preferences;
-        this.autoCompletePreferences = preferences.getAutoCompletePreferences();
+        this.preferencesService = preferencesService;
+        this.initialEntryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.initialAutoCompletePreferences = preferencesService.getAutoCompletePreferences();
     }
 
     @Override
     public void setValues() {
-        openOnNewEntryProperty.setValue(preferences.getBoolean(JabRefPreferences.AUTO_OPEN_FORM));
-        defaultSourceProperty.setValue(preferences.getBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE));
-        enableRelatedArticlesTabProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS));
-        acceptRecommendationsProperty.setValue(preferences.getBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS));
-        enableLatexCitationsTabProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS));
-        enableValidationProperty.setValue(preferences.getBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR));
-        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
-        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
-
-        if (autoCompletePreferences.getOnlyCompleteFirstLast()) {
+        // ToDo: Include CustomizeGeneralFieldsDialog in PreferencesDialog
+        // therefore yet unused: initialEntryEditorPreferences.getEntryEditorTabList();
+
+        openOnNewEntryProperty.setValue(initialEntryEditorPreferences.shouldOpenOnNewEntry());
+        defaultSourceProperty.setValue(initialEntryEditorPreferences.showSourceTabByDefault());
+        enableRelatedArticlesTabProperty.setValue(initialEntryEditorPreferences.shouldShowRecommendationsTab());
+        acceptRecommendationsProperty.setValue(initialEntryEditorPreferences.isMrdlibAccepted());
+        enableLatexCitationsTabProperty.setValue(initialEntryEditorPreferences.shouldShowLatexCitationsTab());
+        enableValidationProperty.setValue(initialEntryEditorPreferences.isEnableValidation());
+
+        enableAutoCompleteProperty.setValue(initialAutoCompletePreferences.shouldAutoComplete());
+        autoCompleteFieldsProperty.setValue(initialAutoCompletePreferences.getCompleteNamesAsString());
+
+        if (initialAutoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST) {
             autoCompleteFirstLastProperty.setValue(true);
-        } else if (autoCompletePreferences.getOnlyCompleteLastFirst()) {
+        } else if (initialAutoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
             autoCompleteLastFirstProperty.setValue(true);
         } else {
             autoCompleteBothProperty.setValue(true);
         }
 
-        switch (autoCompletePreferences.getFirstNameMode()) {
+        switch (initialAutoCompletePreferences.getFirstNameMode()) {
             case ONLY_ABBREVIATED:
                 firstNameModeAbbreviatedProperty.setValue(true);
                 break;
@@ -78,35 +82,37 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        preferences.putBoolean(JabRefPreferences.AUTO_OPEN_FORM, openOnNewEntryProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.DEFAULT_SHOW_SOURCE, defaultSourceProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.SHOW_RECOMMENDATIONS, enableRelatedArticlesTabProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.ACCEPT_RECOMMENDATIONS, acceptRecommendationsProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.SHOW_LATEX_CITATIONS, enableLatexCitationsTabProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.VALIDATE_IN_ENTRY_EDITOR, enableValidationProperty.getValue());
-
-        autoCompletePreferences.setShouldAutoComplete(enableAutoCompleteProperty.getValue());
-        autoCompletePreferences.setCompleteNames(autoCompleteFieldsProperty.getValue());
-        if (autoCompleteBothProperty.getValue()) {
-            autoCompletePreferences.setOnlyCompleteFirstLast(false);
-            autoCompletePreferences.setOnlyCompleteLastFirst(false);
-        } else if (autoCompleteFirstLastProperty.getValue()) {
-            autoCompletePreferences.setOnlyCompleteFirstLast(true);
-            autoCompletePreferences.setOnlyCompleteLastFirst(false);
-        } else {
-            autoCompletePreferences.setOnlyCompleteFirstLast(false);
-            autoCompletePreferences.setOnlyCompleteLastFirst(true);
+        preferencesService.storeEntryEditorPreferences(new EntryEditorPreferences(
+                initialEntryEditorPreferences.getEntryEditorTabList(),
+                openOnNewEntryProperty.getValue(),
+                enableRelatedArticlesTabProperty.getValue(),
+                acceptRecommendationsProperty.getValue(),
+                enableLatexCitationsTabProperty.getValue(),
+                defaultSourceProperty.getValue(),
+                enableValidationProperty.getValue()));
+
+        // default
+        AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
+        if (autoCompleteFirstLastProperty.getValue()) {
+            nameFormat = AutoCompletePreferences.NameFormat.FIRST_LAST;
+        } else if (autoCompleteLastFirstProperty.getValue()) {
+            nameFormat = AutoCompletePreferences.NameFormat.LAST_FIRST;
         }
 
+        // default: AutoCompleteFirstNameMode.BOTH
+        AutoCompleteFirstNameMode firstNameMode = AutoCompleteFirstNameMode.BOTH;
         if (firstNameModeAbbreviatedProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(ONLY_ABBREVIATED);
+            firstNameMode = AutoCompleteFirstNameMode.ONLY_ABBREVIATED;
         } else if (firstNameModeFullProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(ONLY_FULL);
-        } else {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
+            firstNameMode = AutoCompleteFirstNameMode.ONLY_FULL;
         }
 
-        preferences.storeAutoCompletePreferences(autoCompletePreferences);
+        preferencesService.storeAutoCompletePreferences(new AutoCompletePreferences(
+                enableAutoCompleteProperty.getValue(),
+                firstNameMode,
+                nameFormat,
+                FieldFactory.parseFieldList(autoCompleteFieldsProperty.getValue()),
+                preferencesService.getJournalAbbreviationPreferences()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
index 1990315fe01..44c18f3c6a1 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabViewModel.java
@@ -61,9 +61,9 @@ public MainTableColumnModel fromString(String string) {
     private final BooleanProperty specialFieldsSerializeProperty = new SimpleBooleanProperty();
     private final BooleanProperty extraFileColumnsEnabledProperty = new SimpleBooleanProperty();
 
-    private Validator columnsNotEmptyValidator;
+    private final Validator columnsNotEmptyValidator;
 
-    private List<String> restartWarnings = new ArrayList<>();
+    private final List<String> restartWarnings = new ArrayList<>();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -119,9 +119,9 @@ public void setValues() {
                 new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER),
                 new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
                 new MainTableColumnModel(MainTableColumnModel.Type.FILES),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.TIMESTAMP.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.OWNER.getName()),
-                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.GROUPS.getName()),
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.TIMESTAMP.getName()),
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.OWNER.getName()),
+                new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, StandardField.GROUPS.getName()),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.KEY_FIELD.getName()),
                 new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, InternalField.TYPE_HEADER.getName())
         );
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index 341ff97cc92..94a5e0cbc79 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -42,9 +42,9 @@
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.AppendPersonNamesStrategy;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
-import org.jabref.gui.autocompleter.AutoCompleteSuggestionProvider;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.PersonNameStringConverter;
+import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -276,12 +276,12 @@ private void informUserAboutInvalidSearchQuery() {
         currentResults.setText(illegalSearch);
     }
 
-    public void setAutoCompleter(AutoCompleteSuggestionProvider<Author> searchCompleter) {
+    public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
         if (Globals.prefs.getAutoCompletePreferences().shouldAutoComplete()) {
             AutoCompletionTextInputBinding<Author> autoComplete = AutoCompletionTextInputBinding.autoComplete(searchField,
-                                                                                                              searchCompleter,
-                                                                                                              new PersonNameStringConverter(false, false, AutoCompleteFirstNameMode.BOTH),
-                                                                                                              new AppendPersonNamesStrategy());
+                    searchCompleter::provideSuggestions,
+                    new PersonNameStringConverter(false, false, AutoCompleteFirstNameMode.BOTH),
+                    new AppendPersonNamesStrategy());
             AutoCompletePopup<Author> popup = getPopup(autoComplete);
             popup.setSkin(new SearchPopupSkin<>(popup));
         }
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
index 63279fcfece..b6d903b3e6c 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
@@ -52,7 +52,7 @@ static String generateKey(BibEntry entry, String pattern) {
     static String generateKey(BibEntry entry, String pattern, BibDatabase database) {
         GlobalBibtexKeyPattern keyPattern = new GlobalBibtexKeyPattern(Collections.emptyList());
         keyPattern.setDefaultValue("[" + pattern + "]");
-        return new BibtexKeyGenerator(keyPattern, database, new BibtexKeyPatternPreferences("", "", false, true, true, keyPattern, ','))
+        return new BibtexKeyGenerator(keyPattern, database, new BibtexKeyPatternPreferences("", "", false, true, true, keyPattern, ',', false))
                 .generateKey(entry);
     }
 
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
index 64d0137a74e..e67e234e931 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
@@ -11,10 +11,17 @@ public class BibtexKeyPatternPreferences {
     private final boolean enforceLegalKey;
     private final GlobalBibtexKeyPattern keyPattern;
     private Character keywordDelimiter;
+    private boolean avoidOverwritingCiteKey;
+
+    public BibtexKeyPatternPreferences(String keyPatternRegex,
+                                       String keyPatternReplacement,
+                                       boolean alwaysAddLetter,
+                                       boolean firstLetterA,
+                                       boolean enforceLegalKey,
+                                       GlobalBibtexKeyPattern keyPattern,
+                                       Character keywordDelimiter,
+                                       boolean avoidOverwritingCiteKey) {
 
-    public BibtexKeyPatternPreferences(String keyPatternRegex, String keyPatternReplacement, boolean alwaysAddLetter,
-                                       boolean firstLetterA, boolean enforceLegalKey, GlobalBibtexKeyPattern keyPattern,
-                                       Character keywordDelimiter) {
         this.keyPatternRegex = keyPatternRegex;
         this.keyPatternReplacement = keyPatternReplacement;
         this.alwaysAddLetter = alwaysAddLetter;
@@ -22,6 +29,7 @@ public BibtexKeyPatternPreferences(String keyPatternRegex, String keyPatternRepl
         this.enforceLegalKey = enforceLegalKey;
         this.keyPattern = keyPattern;
         this.keywordDelimiter = keywordDelimiter;
+        this.avoidOverwritingCiteKey = avoidOverwritingCiteKey;
     }
 
     public String getKeyPatternRegex() {
@@ -51,4 +59,8 @@ public GlobalBibtexKeyPattern getKeyPattern() {
     public Character getKeywordDelimiter() {
         return keywordDelimiter;
     }
+
+    public boolean avoidOverwritingCiteKey() {
+        return avoidOverwritingCiteKey;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index b1f57d207eb..6011dd8e789 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -22,7 +22,6 @@
 public class ParserResult {
     private final Set<BibEntryType> entryTypes;
     private final List<String> warnings = new ArrayList<>();
-    private final List<String> duplicateKeys = new ArrayList<>();
     private BibDatabase database;
     private MetaData metaData;
     private Path file;
@@ -35,7 +34,7 @@ public ParserResult() {
     }
 
     public ParserResult(Collection<BibEntry> entries) {
-        this(BibDatabases.createDatabase(BibDatabases.purgeEmptyEntries(entries)));
+        this(new BibDatabase(BibDatabases.purgeEmptyEntries(entries)));
     }
 
     public ParserResult(BibDatabase database) {
@@ -126,35 +125,6 @@ public List<String> warnings() {
         return new ArrayList<>(warnings);
     }
 
-    /**
-     * Add a key to the list of duplicated BibTeX keys found in the database.
-     *
-     * @param key The duplicated key
-     */
-    public void addDuplicateKey(String key) {
-        if (!duplicateKeys.contains(key)) {
-            duplicateKeys.add(key);
-        }
-    }
-
-    /**
-     * Query whether any duplicated BibTeX keys have been found in the database.
-     *
-     * @return true if there is at least one duplicate key.
-     */
-    public boolean hasDuplicateKeys() {
-        return !duplicateKeys.isEmpty();
-    }
-
-    /**
-     * Get all duplicated keys found in the database.
-     *
-     * @return A list containing the duplicated keys.
-     */
-    public List<String> getDuplicateKeys() {
-        return duplicateKeys;
-    }
-
     public boolean isInvalid() {
         return invalid;
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
index 2e419a8271d..b8daa91975a 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -20,7 +20,6 @@
 import org.jabref.model.cleanup.FieldFormatterCleanup;
 import org.jabref.model.cleanup.FieldFormatterCleanups;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
@@ -66,7 +65,7 @@ public void doPostCleanup(BibEntry entry) {
 
         FieldFormatterCleanups cleanups = new FieldFormatterCleanups(true,
                 List.of(
-                        new FieldFormatterCleanup(InternalField.TIMESTAMP, new ClearFormatter()),
+                        new FieldFormatterCleanup(StandardField.TIMESTAMP, new ClearFormatter()),
                         // unescape the the contents of the URL field, e.g., some\_url\_part becomes some_url_part
                         new FieldFormatterCleanup(StandardField.URL, new LayoutFormatterBasedFormatter(new RemoveLatexCommandsFormatter()))
                 ));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index d3b1c2ba865..a7d0307efe6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -38,7 +38,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.metadata.MetaData;
@@ -141,11 +140,7 @@ public ParserResult parse(Reader in) throws IOException {
 
         skipWhitespace();
 
-        try {
-            return parseFileContent();
-        } catch (KeyCollisionException kce) {
-            throw new IOException("Duplicate ID in bibtex file: " + kce);
-        }
+        return parseFileContent();
     }
 
     private void initializeParserResult() {
@@ -246,12 +241,7 @@ private void parseAndAddEntry(String type) {
             // store complete parsed serialization (comments, type definition + type contents)
             entry.setParsedSerialization(commentsAndEntryTypeDefinition + dumpTextReadSoFarToString());
 
-            boolean duplicateKey = database.insertEntry(entry);
-            if (duplicateKey) {
-                entry.getField(InternalField.KEY_FIELD).ifPresent(
-                        key -> parserResult.addDuplicateKey(key)
-                );
-            }
+            database.insertEntry(entry);
         } catch (IOException ex) {
             // Trying to make the parser more robust.
             // If an exception is thrown when parsing an entry, drop the entry and try to resume parsing.
@@ -278,7 +268,7 @@ private void parseJabRefComment(Map<String, String> meta) {
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
         if (comment.substring(0, Math.min(comment.length(), MetaData.META_FLAG.length())).equals(MetaData.META_FLAG)) {
 
-            if (comment.substring(0, MetaData.META_FLAG.length()).equals(MetaData.META_FLAG)) {
+            if (comment.startsWith(MetaData.META_FLAG)) {
                 String rest = comment.substring(MetaData.META_FLAG.length());
 
                 int pos = rest.indexOf(':');
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index cd91bd6c3c8..c7fc6304bdc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -78,7 +78,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
@@ -372,7 +371,7 @@ private void parseArticle(PubmedArticle article, List<BibEntry> bibItems) {
             }
 
             fields.put(StandardField.PMID, medlineCitation.getPMID().getContent());
-            fields.put(InternalField.OWNER, medlineCitation.getOwner());
+            fields.put(StandardField.OWNER, medlineCitation.getOwner());
 
             addArticleInformation(fields, medlineCitation.getArticle().getContent());
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
index 1d6d49349e0..5a4b2bcc196 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -16,7 +16,6 @@
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
@@ -170,7 +169,7 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 hashMap.put("STAT", new UnknownField("status"));
                 hashMap.put("SB", new UnknownField("subset"));
                 hashMap.put("OTO", new UnknownField("termowner"));
-                hashMap.put("OWN", InternalField.OWNER);
+                hashMap.put("OWN", StandardField.OWNER);
 
                 // add the fields to hm
                 for (Map.Entry<String, Field> mapEntry : hashMap.entrySet()) {
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 681571cb53c..5c1a04a6a38 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -10,7 +10,7 @@
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 
 public class UpdateField {
 
@@ -95,7 +95,7 @@ public static void setAutomaticFields(BibEntry entry, boolean overwriteOwner, bo
         String defaultOwner = ownerPreferences.getDefaultOwner();
         String timestamp = DateTimeFormatter.ofPattern(timestampPreferences.getTimestampFormat()).format(LocalDateTime.now());
         Field timeStampField = timestampPreferences.getTimestampField();
-        boolean setOwner = ownerPreferences.isUseOwner() && (overwriteOwner || (!entry.hasField(InternalField.OWNER)));
+        boolean setOwner = ownerPreferences.isUseOwner() && (overwriteOwner || (!entry.hasField(StandardField.OWNER)));
         boolean setTimeStamp = timestampPreferences.isUseTimestamps() && (overwriteTimestamp || (!entry.hasField(timeStampField)));
 
         setAutomaticFields(entry, setOwner, defaultOwner, setTimeStamp, timeStampField, timestamp);
@@ -116,7 +116,7 @@ private static void setAutomaticFields(BibEntry entry, boolean setOwner, String
         // Set owner field if this option is enabled:
         if (setOwner) {
             // Set owner field to default value
-            entry.setField(InternalField.OWNER, owner);
+            entry.setField(StandardField.OWNER, owner);
         }
 
         if (setTimeStamp) {
@@ -147,7 +147,7 @@ public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwri
 
         // Iterate through all entries
         for (BibEntry curEntry : bibs) {
-            boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(InternalField.OWNER)));
+            boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
             boolean setTimeStamp = globalSetTimeStamp && (overwriteTimestamp || (!curEntry.hasField(timeStampField)));
             setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timeStampField, timestamp);
         }
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 6496283130a..ea8f1ac2077 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -169,46 +169,35 @@ public synchronized List<BibEntry> getEntriesByKey(String key) {
     }
 
     /**
-     * Inserts the entry, given that its ID is not already in use.
-     * use Util.createId(...) to make up a unique ID for an entry.
+     * Inserts the entry.
      *
-     * @param entry BibEntry to insert into the database
-     * @return false if the insert was done without a duplicate warning
-     * @throws KeyCollisionException thrown if the entry id ({@link BibEntry#getId()}) is already  present in the database
+     * @param entry entry to insert
      */
-    public synchronized boolean insertEntry(BibEntry entry) throws KeyCollisionException {
-        return insertEntry(entry, EntriesEventSource.LOCAL);
+    public synchronized void insertEntry(BibEntry entry) {
+        insertEntry(entry, EntriesEventSource.LOCAL);
     }
 
     /**
-     * Inserts the entry, given that its ID is not already in use.
-     * use Util.createId(...) to make up a unique ID for an entry.
+     * Inserts the entry.
      *
-     * @param entry BibEntry to insert
-     * @param eventSource Source the event is sent from
-     * @return false if the insert was done without a duplicate warning
+     * @param entry       entry to insert
+     * @param eventSource source the event is sent from
      */
-    public synchronized boolean insertEntry(BibEntry entry, EntriesEventSource eventSource) throws KeyCollisionException {
+    public synchronized void insertEntry(BibEntry entry, EntriesEventSource eventSource) {
         insertEntries(Collections.singletonList(entry), eventSource);
-        return entry.getCiteKeyOptional().map(this::isDuplicateCiteKeyExisting).orElse(false);
     }
 
-    public synchronized void insertEntries(BibEntry... entries) throws KeyCollisionException {
+    public synchronized void insertEntries(BibEntry... entries) {
         insertEntries(Arrays.asList(entries), EntriesEventSource.LOCAL);
     }
 
-    public synchronized void insertEntries(List<BibEntry> entries) throws KeyCollisionException {
+    public synchronized void insertEntries(List<BibEntry> entries) {
         insertEntries(entries, EntriesEventSource.LOCAL);
     }
 
-    public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSource eventSource) throws KeyCollisionException {
+    public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSource eventSource) {
         Objects.requireNonNull(newEntries);
         for (BibEntry entry : newEntries) {
-            String id = entry.getId();
-            if (containsEntryWithId(id)) {
-                throw new KeyCollisionException("ID is already in use, please choose another", id);
-            }
-
             entry.registerListener(this);
         }
         if (newEntries.isEmpty()) {
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 3d85e693d79..750454c84d1 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -1,36 +1,16 @@
 package org.jabref.model.database;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.IdGenerator;
 
 public class BibDatabases {
 
     private BibDatabases() {
     }
 
-    /**
-     * Gets a collection of entries and sets an ID for every entry. After that
-     * all entries are inserted into a new BibDatabase.
-     *
-     * @param entries a collection that contains {@link BibEntry}
-     * @return BibDatabase that contains the entries
-     */
-    public static BibDatabase createDatabase(Collection<BibEntry> entries) {
-        BibDatabase database = new BibDatabase();
-
-        for (BibEntry entry : entries) {
-            entry.setId(IdGenerator.next());
-        }
-        database.insertEntries(new ArrayList<>(entries));
-
-        return database;
-    }
-
     /**
      * Receives a Collection of BibEntry instances, iterates through them, and
      * removes all entries that have no fields set. This is useful for rooting out
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 0bfe4f7b11b..7092d6af4d9 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -70,7 +70,7 @@ public class BibEntry implements Cloneable {
     /**
      * Cache that stores the field as keyword lists (format &lt;Field, Separator, Keyword list>)
      */
-    private final MultiKeyMap<Field, Character, KeywordList> fieldsAsKeywords = new MultiKeyMap<>();
+    private final MultiKeyMap<StandardField, Character, KeywordList> fieldsAsKeywords = new MultiKeyMap<>(StandardField.class);
 
     private final EventBus eventBus = new EventBus();
     private String id;
@@ -91,28 +91,16 @@ public class BibEntry implements Cloneable {
      * Constructs a new BibEntry. The internal ID is set to IdGenerator.next()
      */
     public BibEntry() {
-        this(IdGenerator.next(), DEFAULT_TYPE);
-    }
-
-    /**
-     * Constructs a new BibEntry with the given ID and given type
-     *
-     * @param id   The ID to be used
-     * @param type The type to set. May be null or empty. In that case, DEFAULT_TYPE is used.
-     */
-    private BibEntry(String id, EntryType type) {
-        Objects.requireNonNull(id, "Every BibEntry must have an ID");
-
-        this.id = id;
-        setType(type);
-        this.sharedBibEntryData = new SharedBibEntryData();
+        this(DEFAULT_TYPE);
     }
 
     /**
      * Constructs a new BibEntry. The internal ID is set to IdGenerator.next()
      */
     public BibEntry(EntryType type) {
-        this(IdGenerator.next(), type);
+        this.id = IdGenerator.next();
+        setType(type);
+        this.sharedBibEntryData = new SharedBibEntryData();
     }
 
     public Optional<FieldChange> setMonth(Month parsedMonth) {
@@ -621,7 +609,7 @@ public boolean allFieldsPresent(Collection<OrFields> fields, BibDatabase databas
      */
     @Override
     public Object clone() {
-        BibEntry clone = new BibEntry(IdGenerator.next(), type.getValue());
+        BibEntry clone = new BibEntry(type.getValue());
         clone.fields = FXCollections.observableMap(new ConcurrentHashMap<>(fields));
         return clone;
     }
@@ -856,16 +844,21 @@ public Set<String> getFieldAsWords(Field field) {
     }
 
     public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
-        Optional<KeywordList> storedList = fieldsAsKeywords.get(field, keywordSeparator);
-        if (storedList.isPresent()) {
-            return storedList.get();
-        } else {
-            KeywordList keywords = getField(field)
-                    .map(content -> KeywordList.parse(content, keywordSeparator))
-                    .orElse(new KeywordList());
-            fieldsAsKeywords.put(field, keywordSeparator, keywords);
-            return keywords;
+        if (field instanceof StandardField) {
+            Optional<KeywordList> storedList = fieldsAsKeywords.get((StandardField) field, keywordSeparator);
+            if (storedList.isPresent()) {
+                return storedList.get();
+            }
         }
+
+        KeywordList keywords = getField(field)
+                .map(content -> KeywordList.parse(content, keywordSeparator))
+                .orElse(new KeywordList());
+
+        if (field instanceof StandardField) {
+            fieldsAsKeywords.put((StandardField) field, keywordSeparator, keywords);
+        }
+        return keywords;
     }
 
     public Optional<FieldChange> clearCiteKey() {
@@ -875,7 +868,10 @@ public Optional<FieldChange> clearCiteKey() {
     private void invalidateFieldCache(Field field) {
         latexFreeFields.remove(field);
         fieldsAsWords.remove(field);
-        fieldsAsKeywords.remove(field);
+
+        if (field instanceof StandardField) {
+            fieldsAsKeywords.remove((StandardField) field);
+        }
     }
 
     public Optional<String> getLatexFreeField(Field field) {
diff --git a/src/main/java/org/jabref/model/entry/field/FieldFactory.java b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
index a5086283f6a..8c99795ed37 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -134,7 +134,7 @@ private static Set<Field> getAllFields() {
      * separate preferences object
      */
     public static List<Field> getDefaultGeneralFields() {
-        List<Field> defaultGeneralFields = new ArrayList<>(Arrays.asList(StandardField.DOI, StandardField.CROSSREF, StandardField.KEYWORDS, StandardField.EPRINT, StandardField.URL, StandardField.FILE, InternalField.GROUPS, InternalField.OWNER, InternalField.TIMESTAMP));
+        List<Field> defaultGeneralFields = new ArrayList<>(Arrays.asList(StandardField.DOI, StandardField.CROSSREF, StandardField.KEYWORDS, StandardField.EPRINT, StandardField.URL, StandardField.FILE, StandardField.GROUPS, StandardField.OWNER, StandardField.TIMESTAMP));
         defaultGeneralFields.addAll(EnumSet.allOf(SpecialField.class));
         return defaultGeneralFields;
     }
diff --git a/src/main/java/org/jabref/model/entry/field/InternalField.java b/src/main/java/org/jabref/model/entry/field/InternalField.java
index 9fabf4801e1..3ee97e605c2 100644
--- a/src/main/java/org/jabref/model/entry/field/InternalField.java
+++ b/src/main/java/org/jabref/model/entry/field/InternalField.java
@@ -7,12 +7,9 @@
 import java.util.Set;
 
 /**
- * JabRef internal fields
+ * JabRef internal fields. These are not normal fields but mostly place holders with special functions.
  */
 public enum InternalField implements Field {
-    OWNER("owner"),
-    TIMESTAMP("timestamp", FieldProperty.DATE),
-    GROUPS("groups"),
     KEY_FIELD("bibtexkey"),
     /**
      * field which indicates the entrytype
diff --git a/src/main/java/org/jabref/model/entry/field/SpecialField.java b/src/main/java/org/jabref/model/entry/field/SpecialField.java
index 2f54fd7bad4..188b37e7370 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialField.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialField.java
@@ -37,19 +37,19 @@ public enum SpecialField implements Field {
     ),
 
     READ_STATUS("readstatus",
-        SpecialFieldValue.CLEAR_READ_STATUS,
-        SpecialFieldValue.READ,
-        SpecialFieldValue.SKIMMED
+            SpecialFieldValue.CLEAR_READ_STATUS,
+            SpecialFieldValue.READ,
+            SpecialFieldValue.SKIMMED
     ),
 
     RELEVANCE("relevance",
-        SpecialFieldValue.RELEVANT
+            SpecialFieldValue.RELEVANT
     );
 
-    private List<SpecialFieldValue> values;
-    private KeywordList keywords;
-    private HashMap<String, SpecialFieldValue> map;
-    private String fieldName;
+    private final List<SpecialFieldValue> values;
+    private final KeywordList keywords;
+    private final HashMap<String, SpecialFieldValue> map;
+    private final String fieldName;
 
     SpecialField(String fieldName, SpecialFieldValue... values) {
         this.fieldName = fieldName;
diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
index 6f10d4e0c57..a79a4208e4b 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -7,7 +7,7 @@
 import java.util.Set;
 
 /**
- * Standard BibTeX and BibLaTeX fields
+ * Standard BibTeX and BibLaTeX fields, as well as "normal" JabRef specific fields.
  */
 public enum StandardField implements Field {
 
@@ -124,7 +124,12 @@ public enum StandardField implements Field {
     YEARFILED("yearfiled"),
     MR_NUMBER("mrnumber"),
     XDATA("xdata", FieldProperty.MULTIPLE_ENTRY_LINK),
-    XREF("xref", FieldProperty.SINGLE_ENTRY_LINK);
+    XREF("xref", FieldProperty.SINGLE_ENTRY_LINK),
+
+    // JabRef-specific fields
+    GROUPS("groups"),
+    OWNER("owner"),
+    TIMESTAMP("timestamp", FieldProperty.DATE);
 
     private final String name;
     private final String displayName;
diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
index 12c12f7b05c..06dfcd983c1 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -1,7 +1,6 @@
 package org.jabref.model.groups;
 
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -10,13 +9,12 @@
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.OptionalUtil;
 
 public class AutomaticKeywordGroup extends AutomaticGroup {
 
-    private Character keywordDelimiter;
-    private Character keywordHierarchicalDelimiter;
-    private Field field;
+    private final Character keywordDelimiter;
+    private final Character keywordHierarchicalDelimiter;
+    private final Field field;
 
     public AutomaticKeywordGroup(String name, GroupHierarchyType context, Field field, Character keywordDelimiter, Character keywordHierarchicalDelimiter) {
         super(name, context);
@@ -62,13 +60,11 @@ public int hashCode() {
 
     @Override
     public Set<GroupTreeNode> createSubgroups(BibEntry entry) {
-        Optional<KeywordList> keywordList = entry.getLatexFreeField(field)
-                                                 .map(fieldValue -> KeywordList.parse(fieldValue, keywordDelimiter));
-        return OptionalUtil.toStream(keywordList)
-                           .flatMap(KeywordList::stream)
-                           .filter(keyword -> StringUtil.isNotBlank(keyword.get()))
-                           .map(this::createGroup)
-                           .collect(Collectors.toSet());
+        KeywordList keywordList = entry.getFieldAsKeywords(field, keywordDelimiter);
+        return keywordList.stream()
+                          .filter(keyword -> StringUtil.isNotBlank(keyword.get()))
+                          .map(this::createGroup)
+                          .collect(Collectors.toSet());
     }
 
     private GroupTreeNode createGroup(Keyword keywordChain) {
diff --git a/src/main/java/org/jabref/model/groups/ExplicitGroup.java b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
index d05c8531ceb..53a01bc519d 100644
--- a/src/main/java/org/jabref/model/groups/ExplicitGroup.java
+++ b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
@@ -5,13 +5,13 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 
 /**
  * This group contains entries, which were manually assigned to it.
- * Assignments are stored in the {@link InternalField#GROUPS} field.
+ * Assignments are stored in the {@link StandardField#GROUPS} field.
  * Thus, internally, we represent {@link ExplicitGroup} as a special {@link WordKeywordGroup} operating on
- * {@link InternalField#GROUPS}.
+ * {@link StandardField#GROUPS}.
  */
 public class ExplicitGroup extends WordKeywordGroup {
 
@@ -22,7 +22,7 @@ public class ExplicitGroup extends WordKeywordGroup {
     private final List<String> legacyEntryKeys = new ArrayList<>();
 
     public ExplicitGroup(String name, GroupHierarchyType context, Character keywordSeparator) {
-        super(name, context, InternalField.GROUPS, name, true, keywordSeparator, true);
+        super(name, context, StandardField.GROUPS, name, true, keywordSeparator, true);
     }
 
     public void addLegacyEntryKey(String key) {
diff --git a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
index c4d4432ee62..46ca9fc7e49 100644
--- a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
@@ -13,7 +13,10 @@
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.types.EntryType;
+import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.model.strings.StringUtil;
+import org.jabref.model.util.ListUtil;
 
 /**
  * Matches entries if a given field contains a specified word.
@@ -21,7 +24,7 @@
 public class WordKeywordGroup extends KeywordGroup implements GroupEntryChanger {
 
     protected final Character keywordSeparator;
-    private final Set<String> searchWords;
+    private final SearchStrategy searchStrategy;
     private final boolean onlySplitWordsAtSeparator;
 
     public WordKeywordGroup(String name, GroupHierarchyType context, Field searchField,
@@ -31,7 +34,16 @@ public WordKeywordGroup(String name, GroupHierarchyType context, Field searchFie
 
         this.keywordSeparator = keywordSeparator;
         this.onlySplitWordsAtSeparator = onlySplitWordsAtSeparator;
-        this.searchWords = getSearchWords(searchExpression);
+
+        if (onlySplitWordsAtSeparator) {
+            if (InternalField.TYPE_HEADER.equals(searchField)) {
+                searchStrategy = new TypeSearchStrategy();
+            } else {
+                searchStrategy = new KeywordListSearchStrategy();
+            }
+        } else {
+            searchStrategy = new StringSearchStrategy();
+        }
     }
 
     private static boolean containsCaseInsensitive(Set<String> searchIn, Collection<String> searchFor) {
@@ -105,31 +117,7 @@ public boolean equals(Object o) {
 
     @Override
     public boolean contains(BibEntry entry) {
-        Set<String> content = getFieldContentAsWords(entry);
-        if (caseSensitive) {
-            return content.containsAll(searchWords);
-        } else {
-            return containsCaseInsensitive(content, searchWords);
-        }
-    }
-
-    private Set<String> getFieldContentAsWords(BibEntry entry) {
-        if (onlySplitWordsAtSeparator) {
-            if (InternalField.TYPE_HEADER.equals(searchField)) {
-                return searchWords.stream().filter(word -> entry.getType().getName().equalsIgnoreCase(word)).collect(Collectors.toSet());
-            }
-            return entry.getFieldAsKeywords(searchField, keywordSeparator).toStringList();
-        } else {
-            return entry.getFieldAsWords(searchField);
-        }
-    }
-
-    private Set<String> getSearchWords(String searchExpression) {
-        if (onlySplitWordsAtSeparator) {
-            return KeywordList.parse(searchExpression, keywordSeparator).toStringList();
-        } else {
-            return new HashSet<>(StringUtil.getStringAsWords(searchExpression));
-        }
+        return searchStrategy.contains(entry);
     }
 
     @Override
@@ -148,4 +136,59 @@ public int hashCode() {
                 keywordSeparator,
                 onlySplitWordsAtSeparator);
     }
+
+    interface SearchStrategy {
+        boolean contains(BibEntry entry);
+    }
+
+    class StringSearchStrategy implements SearchStrategy {
+        Set<String> searchWords;
+
+        StringSearchStrategy() {
+            searchWords = new HashSet<>(StringUtil.getStringAsWords(searchExpression));
+        }
+
+        @Override
+        public boolean contains(BibEntry entry) {
+            Set<String> content = entry.getFieldAsWords(searchField);
+            if (caseSensitive) {
+                return content.containsAll(searchWords);
+            } else {
+                return containsCaseInsensitive(content, searchWords);
+            }
+        }
+    }
+
+    class TypeSearchStrategy implements SearchStrategy {
+
+        Set<EntryType> searchWords;
+
+        TypeSearchStrategy() {
+            searchWords = KeywordList.parse(searchExpression, keywordSeparator)
+                                     .stream()
+                                     .map(word -> EntryTypeFactory.parse(word.get()))
+                                     .collect(Collectors.toSet());
+        }
+
+        @Override
+        public boolean contains(BibEntry entry) {
+            return searchWords.stream()
+                              .anyMatch(word -> entry.getType().equals(word));
+        }
+    }
+
+    class KeywordListSearchStrategy implements SearchStrategy {
+
+        private final KeywordList searchWords;
+
+        KeywordListSearchStrategy() {
+            searchWords = KeywordList.parse(searchExpression, keywordSeparator);
+        }
+
+        @Override
+        public boolean contains(BibEntry entry) {
+            KeywordList fieldValue = entry.getFieldAsKeywords(searchField, keywordSeparator);
+            return ListUtil.allMatch(searchWords, fieldValue::contains);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/model/search/matchers/OrMatcher.java b/src/main/java/org/jabref/model/search/matchers/OrMatcher.java
index c0a0eddf1d9..578b2b97c00 100644
--- a/src/main/java/org/jabref/model/search/matchers/OrMatcher.java
+++ b/src/main/java/org/jabref/model/search/matchers/OrMatcher.java
@@ -1,6 +1,7 @@
 package org.jabref.model.search.matchers;
 
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.util.ListUtil;
 
 /**
  * A set of matchers that returns true if any matcher matches the given entry.
@@ -9,7 +10,6 @@ public class OrMatcher extends MatcherSet {
 
     @Override
     public boolean isMatch(BibEntry entry) {
-        return matchers.stream()
-                       .anyMatch(rule -> rule.isMatch(entry));
+        return ListUtil.anyMatch(matchers, rule -> rule.isMatch(entry));
     }
 }
diff --git a/src/main/java/org/jabref/model/util/ListUtil.java b/src/main/java/org/jabref/model/util/ListUtil.java
new file mode 100644
index 00000000000..9f9589b05ab
--- /dev/null
+++ b/src/main/java/org/jabref/model/util/ListUtil.java
@@ -0,0 +1,33 @@
+package org.jabref.model.util;
+
+import java.util.function.Predicate;
+
+/**
+ * Provides a few helper methods for lists.
+ */
+public class ListUtil {
+
+    /**
+     * Equivalent to list.stream().anyMatch but with slightly better performance (especially for small lists).
+     */
+    public static <T> boolean anyMatch(Iterable<T> list, Predicate<T> predicate) {
+        for (T element : list) {
+            if (predicate.test(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Equivalent to list.stream().allMatch but with slightly better performance (especially for small lists).
+     */
+    public static <T> boolean allMatch(Iterable<T> list, Predicate<T> predicate) {
+        for (T element : list) {
+            if (!predicate.test(element)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/org/jabref/model/util/MultiKeyMap.java b/src/main/java/org/jabref/model/util/MultiKeyMap.java
index c5ba8bbfbf4..f732724a26f 100644
--- a/src/main/java/org/jabref/model/util/MultiKeyMap.java
+++ b/src/main/java/org/jabref/model/util/MultiKeyMap.java
@@ -1,11 +1,16 @@
 package org.jabref.model.util;
 
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-public class MultiKeyMap<K1, K2, V> {
-    private final Map<K1, Map<K2, V>> map = new HashMap<>();
+public class MultiKeyMap<K1 extends Enum<K1>, K2, V> {
+    private final EnumMap<K1, Map<K2, V>> map;
+
+    public MultiKeyMap(Class<K1> keyType) {
+        map = new EnumMap<>(keyType);
+    }
 
     public Optional<V> get(K1 key1, K2 key2) {
         Map<K2, V> metaValue = map.get(key1);
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 9af9a2a81c1..ce792463db4 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -42,7 +43,6 @@
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
-import org.jabref.gui.entryeditor.EntryEditorTabList;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.maintable.ColumnPreferences;
@@ -579,7 +579,7 @@ private JabRefPreferences() {
         // default time stamp follows ISO-8601. Reason: https://xkcd.com/1179/
         defaults.put(TIME_STAMP_FORMAT, "yyyy-MM-dd");
 
-        defaults.put(TIME_STAMP_FIELD, InternalField.TIMESTAMP.getName());
+        defaults.put(TIME_STAMP_FIELD, StandardField.TIMESTAMP.getName());
         defaults.put(UPDATE_TIMESTAMP, Boolean.FALSE);
 
         defaults.put(GENERATE_KEYS_BEFORE_SAVING, Boolean.FALSE);
@@ -763,21 +763,6 @@ private static void insertDefaultCleanupPreset(Map<String, Object> storage) {
         storage.put(CLEANUP_FORMATTERS, convertListToString(Cleanups.DEFAULT_SAVE_ACTIONS.getAsStringList(OS.NEWLINE)));
     }
 
-    @Override
-    public EntryEditorPreferences getEntryEditorPreferences() {
-        return new EntryEditorPreferences(getEntryEditorTabList(),
-                getFieldWriterPreferences(),
-                getImportFormatPreferences(),
-                getCustomTabFieldNames(),
-                getBoolean(SHOW_RECOMMENDATIONS),
-                getBoolean(ACCEPT_RECOMMENDATIONS),
-                getBoolean(SHOW_LATEX_CITATIONS),
-                getBoolean(DEFAULT_SHOW_SOURCE),
-                getBibtexKeyPatternPreferences(),
-                Globals.getKeyPrefs(),
-                getBoolean(AVOID_OVERWRITING_KEY));
-    }
-
     public Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         Map<SidePaneType, Integer> preferredPositions = new HashMap<>();
 
@@ -814,58 +799,6 @@ public String getTheme() {
         return get(FX_THEME);
     }
 
-    /**
-     * Get a Map of default tab names to deafult tab fields.
-     * The fields are returned as a String with fields separated by ;
-     * They are combined into one string in order to feed into CustomizeGeneralFieldsDialogViewModel.resetFields()
-     * so that they do not have to be parsed in order to fit there
-     *
-     * @return A map of keys with tab names and values as a string containing
-     * fields for the given name separated by ;
-     */
-    @Override
-    public Map<String, String> getCustomTabsNamesAndFields() {
-        Map<String, String> customTabsMap = new HashMap<>();
-
-        int defNumber = 0;
-        while (true) {
-            // Saved as CUSTOMTABNAME_def{number} and ; separated
-            String name = (String) defaults.get(CUSTOM_TAB_NAME + "_def" + defNumber);
-            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
-
-            if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(fields)) {
-                break;
-            }
-            customTabsMap.put(name, fields);
-            defNumber++;
-        }
-        return customTabsMap;
-    }
-
-    @Override
-    public void setCustomTabsNameAndFields(String name, String fields, int defNumber) {
-        prefs.put(CUSTOM_TAB_NAME + defNumber, name);
-        prefs.put(CUSTOM_TAB_FIELDS + defNumber, fields);
-    }
-
-    private List<Field> getCustomTabFieldNames() {
-        List<Field> customFields = new ArrayList<>();
-
-        int defNumber = 0;
-        while (true) {
-            // saved as CUSTOMTABNAME_def{number} and ; separated
-            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
-
-            if (StringUtil.isNullOrEmpty(fields)) {
-                break;
-            }
-
-            customFields.addAll(Arrays.stream(fields.split(STRINGLIST_DELIMITER.toString())).map(FieldFactory::parseField).collect(Collectors.toList()));
-            defNumber++;
-        }
-        return customFields;
-    }
-
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
@@ -1190,8 +1123,7 @@ private Object getObject(String key) {
      *
      * @param number or higher.
      */
-    @Override
-    public void purgeSeries(String prefix, int number) {
+    private void purgeSeries(String prefix, int number) {
         int n = number;
         while (get(prefix + n) != null) {
             remove(prefix + n);
@@ -1199,19 +1131,6 @@ public void purgeSeries(String prefix, int number) {
         }
     }
 
-    @Override
-    public Map<String, Set<Field>> getEntryEditorTabList() {
-        if (tabList == null) {
-            updateEntryEditorTabList();
-        }
-        return tabList;
-    }
-
-    @Override
-    public void updateEntryEditorTabList() {
-        tabList = EntryEditorTabList.create(this);
-    }
-
     /**
      * Exports Preferences to an XML file.
      *
@@ -1255,7 +1174,7 @@ public void importPreferences(Path file) throws JabRefException {
      *
      * Do not use in production code. Otherwise the singleton pattern is broken and preferences might get lost.
      *
-     * @param owPrefs
+     * @param owPrefs The custom preferences to overwrite the currently present
      */
     public void overwritePreferences(JabRefPreferences owPrefs) {
         singleton = owPrefs;
@@ -1287,6 +1206,7 @@ public FilePreferences getFilePreferences() {
                 get(IMPORT_FILEDIRPATTERN));
     }
 
+    @Override
     public FieldWriterPreferences getFieldWriterPreferences() {
         return new FieldWriterPreferences(
                 getBoolean(RESOLVE_STRINGS_ALL_FIELDS),
@@ -1306,9 +1226,14 @@ public boolean isKeywordSyncEnabled() {
 
     @Override
     public ImportFormatPreferences getImportFormatPreferences() {
-        return new ImportFormatPreferences(customImports, getDefaultEncoding(), getKeywordDelimiter(),
-                                           getBibtexKeyPatternPreferences(), getFieldContentParserPreferences(), getXMPPreferences(),
-                                           isKeywordSyncEnabled());
+        return new ImportFormatPreferences(
+                customImports,
+                getDefaultEncoding(),
+                getKeywordDelimiter(),
+                getBibtexKeyPatternPreferences(),
+                getFieldContentParserPreferences(),
+                getXMPPreferences(),
+                isKeywordSyncEnabled());
     }
 
     @Override
@@ -1357,15 +1282,17 @@ public ExporterFactory getExporterFactory(JournalAbbreviationLoader abbreviation
         return ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);
     }
 
+    @Override
     public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
         return new BibtexKeyPatternPreferences(
-                                               get(KEY_PATTERN_REGEX),
-                                               get(KEY_PATTERN_REPLACEMENT),
-                                               getBoolean(KEY_GEN_ALWAYS_ADD_LETTER),
-                                               getBoolean(KEY_GEN_FIRST_LETTER_A),
-                                               getBoolean(ENFORCE_LEGAL_BIBTEX_KEY),
-                                               getKeyPattern(),
-                                               getKeywordDelimiter());
+                get(KEY_PATTERN_REGEX),
+                get(KEY_PATTERN_REPLACEMENT),
+                getBoolean(KEY_GEN_ALWAYS_ADD_LETTER),
+                getBoolean(KEY_GEN_FIRST_LETTER_A),
+                getBoolean(ENFORCE_LEGAL_BIBTEX_KEY),
+                getKeyPattern(),
+                getKeywordDelimiter(),
+                getBoolean(AVOID_OVERWRITING_KEY));
     }
 
     @Override
@@ -1649,24 +1576,6 @@ public AutoLinkPreferences getAutoLinkPreferences() {
                                        getKeywordDelimiter());
     }
 
-    public AutoCompletePreferences getAutoCompletePreferences() {
-        return new AutoCompletePreferences(
-                getBoolean(AUTO_COMPLETE),
-                AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
-                getBoolean(AUTOCOMPLETER_LAST_FIRST),
-                getBoolean(AUTOCOMPLETER_FIRST_LAST),
-                getStringList(AUTOCOMPLETER_COMPLETE_FIELDS).stream().map(FieldFactory::parseField).collect(Collectors.toSet()),
-                getJournalAbbreviationPreferences());
-    }
-
-    public void storeAutoCompletePreferences(AutoCompletePreferences autoCompletePreferences) {
-        putBoolean(AUTO_COMPLETE, autoCompletePreferences.shouldAutoComplete());
-        put(AUTOCOMPLETER_FIRSTNAME_MODE, autoCompletePreferences.getFirstNameMode().name());
-        putBoolean(AUTOCOMPLETER_LAST_FIRST, autoCompletePreferences.getOnlyCompleteLastFirst());
-        putBoolean(AUTOCOMPLETER_FIRST_LAST, autoCompletePreferences.getOnlyCompleteFirstLast());
-        putStringList(AUTOCOMPLETER_COMPLETE_FIELDS, autoCompletePreferences.getCompleteFields().stream().map(Field::getName).collect(Collectors.toList()));
-    }
-
     public void storeSidePanePreferredPositions(Map<SidePaneType, Integer> preferredPositions) {
         // Split the map into a pair of parallel String lists suitable for storage
         List<String> names = preferredPositions.keySet().stream()
@@ -1907,8 +1816,7 @@ public void saveCustomEntryTypes() {
     }
 
     private void saveCustomEntryTypes(BibDatabaseMode bibDatabaseMode) {
-        List<BibEntryType> customBiblatexBibTexTypes = Globals.entryTypesManager.getAllTypes(bibDatabaseMode).stream()
-                                                                                .map(entryType -> entryType).collect(Collectors.toList());
+        List<BibEntryType> customBiblatexBibTexTypes = new ArrayList<>(Globals.entryTypesManager.getAllTypes(bibDatabaseMode));
 
         storeBibEntryTypes(customBiblatexBibTexTypes, bibDatabaseMode);
     }
@@ -2055,8 +1963,192 @@ public void storeTimestampPreferences(TimestampPreferences preferences) {
         putBoolean(OVERWRITE_TIME_STAMP, preferences.isOverwriteTimestamp());
     }
 
+    //*************************************************************************************************************
+    // ToDo: GroupPreferences
+    //*************************************************************************************************************
+
     @Override
     public boolean getDisplayGroupCount() {
         return getBoolean(JabRefPreferences.DISPLAY_GROUP_COUNT);
     }
+
+    //*************************************************************************************************************
+    // EntryEditorPreferences
+    //*************************************************************************************************************
+
+    /**
+     * Cache a list of defined tabs in the entry editor
+     *
+     * @return a list of defined tabs
+     */
+    @Override
+    public Map<String, Set<Field>> getEntryEditorTabList() {
+        if (tabList == null) {
+            updateEntryEditorTabList();
+        }
+        return tabList;
+    }
+
+    /**
+     * Create a list of currently defined tabs in the entry editor
+     */
+    @Override
+    public void updateEntryEditorTabList() {
+        Map<String, Set<Field>> tabs = new LinkedHashMap<>();
+        int i = 0;
+        String name;
+        if (hasKey(CUSTOM_TAB_NAME + 0)) {
+            // The user has modified from the default values:
+            while (hasKey(CUSTOM_TAB_NAME + i)) {
+                name = get(CUSTOM_TAB_NAME + i);
+                Set<Field> entry = FieldFactory.parseFieldList(get(CUSTOM_TAB_FIELDS + i));
+                tabs.put(name, entry);
+                i++;
+            }
+        } else {
+            // Nothing set, so we use the default values:
+            while (get(JabRefPreferences.CUSTOM_TAB_NAME + "_def" + i) != null) {
+                name = get(JabRefPreferences.CUSTOM_TAB_NAME + "_def" + i);
+                Set<Field> entry = FieldFactory.parseFieldList(get(CUSTOM_TAB_FIELDS + "_def" + i));
+                tabs.put(name, entry);
+                i++;
+            }
+        }
+        tabList = tabs;
+    }
+
+    /**
+     * Stores the defined tabs and corresponding fields in the preferences.
+     *
+     * @param customTabs a map of tab names and the corresponding set of fields to be displayed in
+     */
+    @Override
+    public void storeEntryEditorTabList(Map<String, Set<Field>> customTabs) {
+        String[] names = customTabs.keySet().toArray(String[]::new);
+        String[] fields = customTabs.values().stream()
+                                    .map(set -> set.stream()
+                                                   .map(Field::getName)
+                                                   .collect(Collectors.joining(STRINGLIST_DELIMITER.toString())))
+                                    .toArray(String[]::new);
+
+        for (int i = 0; i < customTabs.size(); i++) {
+            put(CUSTOM_TAB_NAME + i, names[i]);
+            put(CUSTOM_TAB_FIELDS + i, fields[i]);
+        }
+
+        purgeSeries(CUSTOM_TAB_NAME, customTabs.size());
+        purgeSeries(CUSTOM_TAB_FIELDS, customTabs.size());
+
+        updateEntryEditorTabList();
+    }
+
+    /**
+     * Get a Map of default tab names to default tab fields.
+     *
+     * @return A map of keys with tab names and a set of corresponding fields
+     */
+    @Override
+    public Map<String, Set<Field>> getDefaultTabNamesAndFields() {
+        Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
+
+        int defNumber = 0;
+        while (true) {
+            // Saved as 'CUSTOMTABNAME_def{number}' and seperated by ';'
+            String name = (String) defaults.get(CUSTOM_TAB_NAME + "_def" + defNumber);
+            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
+
+            if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(fields)) {
+                break;
+            }
+
+            customTabsMap.put(name, FieldFactory.parseFieldList((String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber)));
+            defNumber++;
+        }
+        return customTabsMap;
+    }
+
+    /**
+     * Get a Map of default tab names to default tab fields.
+     *
+     * @return A map of keys with tab names and a set of corresponding fields
+     */
+    @Override
+    public List<Field> getAllDefaultTabFieldNames() {
+        List<Field> customFields = new ArrayList<>();
+
+        int defNumber = 0;
+        while (true) {
+            // saved as CUSTOMTABNAME_def{number} and ; separated
+            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
+
+            if (StringUtil.isNullOrEmpty(fields)) {
+                break;
+            }
+
+            customFields.addAll(Arrays.stream(fields.split(STRINGLIST_DELIMITER.toString())).map(FieldFactory::parseField).collect(Collectors.toList()));
+            defNumber++;
+        }
+        return customFields;
+    }
+
+    @Override
+    public EntryEditorPreferences getEntryEditorPreferences() {
+        return new EntryEditorPreferences(getEntryEditorTabList(),
+                getBoolean(AUTO_OPEN_FORM),
+                getBoolean(SHOW_RECOMMENDATIONS),
+                getBoolean(ACCEPT_RECOMMENDATIONS),
+                getBoolean(SHOW_LATEX_CITATIONS),
+                getBoolean(DEFAULT_SHOW_SOURCE),
+                getBoolean(VALIDATE_IN_ENTRY_EDITOR));
+    }
+
+    @Override
+    public void storeEntryEditorPreferences(EntryEditorPreferences preferences) {
+        storeEntryEditorTabList(preferences.getEntryEditorTabList());
+        putBoolean(AUTO_OPEN_FORM, preferences.shouldOpenOnNewEntry());
+        putBoolean(SHOW_RECOMMENDATIONS, preferences.shouldShowRecommendationsTab());
+        putBoolean(ACCEPT_RECOMMENDATIONS, preferences.isMrdlibAccepted());
+        putBoolean(SHOW_LATEX_CITATIONS, preferences.shouldShowLatexCitationsTab());
+        putBoolean(DEFAULT_SHOW_SOURCE, preferences.showSourceTabByDefault());
+        putBoolean(VALIDATE_IN_ENTRY_EDITOR, preferences.isEnableValidation());
+    }
+
+    //*************************************************************************************************************
+    // ToDo: Misc preferences
+    //*************************************************************************************************************
+
+    @Override
+    public AutoCompletePreferences getAutoCompletePreferences() {
+        AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
+        if (getBoolean(AUTOCOMPLETER_LAST_FIRST)) {
+            nameFormat = AutoCompletePreferences.NameFormat.LAST_FIRST;
+        } else if (getBoolean(AUTOCOMPLETER_FIRST_LAST)) {
+            nameFormat = AutoCompletePreferences.NameFormat.FIRST_LAST;
+        }
+
+        return new AutoCompletePreferences(
+                getBoolean(AUTO_COMPLETE),
+                AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
+                nameFormat,
+                getStringList(AUTOCOMPLETER_COMPLETE_FIELDS).stream().map(FieldFactory::parseField).collect(Collectors.toSet()),
+                getJournalAbbreviationPreferences());
+    }
+
+    @Override
+    public void storeAutoCompletePreferences(AutoCompletePreferences preferences) {
+        putBoolean(AUTO_COMPLETE, preferences.shouldAutoComplete());
+        put(AUTOCOMPLETER_FIRSTNAME_MODE, preferences.getFirstNameMode().name());
+        putStringList(AUTOCOMPLETER_COMPLETE_FIELDS, preferences.getCompleteFields().stream().map(Field::getName).collect(Collectors.toList()));
+
+        if (preferences.getNameFormat() == AutoCompletePreferences.NameFormat.BOTH) {
+            putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
+            putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
+        } else if (preferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST) {
+            putBoolean(AUTOCOMPLETER_LAST_FIRST, true);
+            putBoolean(AUTOCOMPLETER_FIRST_LAST, false);
+        } else {
+            putBoolean(AUTOCOMPLETER_LAST_FIRST, false);
+            putBoolean(AUTOCOMPLETER_FIRST_LAST, true);
+        }
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index db5265aa928..93ec72ac594 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -6,8 +6,12 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.keyboard.KeyBindingRepository;
+import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
+import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.logic.cleanup.CleanupPreferences;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.exporter.SavePreferences;
@@ -45,6 +49,10 @@ public interface PreferencesService {
 
     FilePreferences getFilePreferences();
 
+    FieldWriterPreferences getFieldWriterPreferences();
+
+    FieldContentFormatterPreferences getFieldContentParserPreferences();
+
     XmpPreferences getXMPPreferences();
 
     AutoLinkPreferences getAutoLinkPreferences();
@@ -59,20 +67,12 @@ public interface PreferencesService {
 
     PreviewPreferences getPreviewPreferences();
 
-    Map<String, Set<Field>> getEntryEditorTabList();
-
-    Map<String, String> getCustomTabsNamesAndFields();
-
-    void setCustomTabsNameAndFields(String name, String fields, int defNumber);
-
-    void purgeSeries(String prefix, int number);
-
-    void updateEntryEditorTabList();
-
     List<TemplateExporter> getCustomExportFormats(JournalAbbreviationLoader loader);
 
     void storeCustomExportFormats(List<TemplateExporter> exporters);
 
+    BibtexKeyPatternPreferences getBibtexKeyPatternPreferences();
+
     LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationLoader loader);
 
     ImportFormatPreferences getImportFormatPreferences();
@@ -101,8 +101,6 @@ public interface PreferencesService {
 
     void saveCustomEntryTypes();
 
-    EntryEditorPreferences getEntryEditorPreferences();
-
     List<BibEntryType> loadBibEntryTypes(BibDatabaseMode mode);
 
     CleanupPreferences getCleanupPreferences(JournalAbbreviationLoader journalAbbreviationLoader);
@@ -111,7 +109,9 @@ public interface PreferencesService {
 
     void setCleanupPreset(CleanupPreset cleanupPreset);
 
-    // General
+    //*************************************************************************************************************
+    // GeneralPreferences
+    //*************************************************************************************************************
 
     Language getLanguage();
 
@@ -141,6 +141,35 @@ public interface PreferencesService {
 
     void storeTimestampPreferences(TimestampPreferences preferences);
 
+    //*************************************************************************************************************
+    // ToDo: GroupPreferences
+    //*************************************************************************************************************
+
     boolean getDisplayGroupCount();
 
+    //*************************************************************************************************************
+    // EntryEditorPreferences
+    //*************************************************************************************************************
+
+    Map<String, Set<Field>> getEntryEditorTabList();
+
+    void updateEntryEditorTabList();
+
+    Map<String, Set<Field>> getDefaultTabNamesAndFields();
+
+    List<Field> getAllDefaultTabFieldNames();
+
+    void storeEntryEditorTabList(Map<String, Set<Field>> customTabsMap);
+
+    EntryEditorPreferences getEntryEditorPreferences();
+
+    void storeEntryEditorPreferences(EntryEditorPreferences preferences);
+
+    //*************************************************************************************************************
+    // ToDo: Misc preferences
+    //*************************************************************************************************************
+
+    AutoCompletePreferences getAutoCompletePreferences();
+
+    void storeAutoCompletePreferences(AutoCompletePreferences autoCompletePreferences);
 }
diff --git a/src/main/resources/csl-locales/locales-nl-NL.xml b/src/main/resources/csl-locales/locales-nl-NL.xml
index 1146f4a156b..f8b63c336aa 100644
--- a/src/main/resources/csl-locales/locales-nl-NL.xml
+++ b/src/main/resources/csl-locales/locales-nl-NL.xml
@@ -66,10 +66,10 @@
     <term name="bc">BC</term>
 
     <!-- PUNCTUATION -->
-    <term name="open-quote">“</term>
-    <term name="close-quote">”</term>
-    <term name="open-inner-quote">‘</term>
-    <term name="close-inner-quote">’</term>
+    <term name="open-quote">‘</term>
+    <term name="close-quote">’</term>
+    <term name="open-inner-quote">“</term>
+    <term name="close-inner-quote">”</term>
     <term name="page-range-delimiter">–</term>
 
     <!-- ORDINALS -->
diff --git a/src/main/resources/csl-styles/animal-welfare.csl b/src/main/resources/csl-styles/animal-welfare.csl
index 754fa153c91..2e6427ac743 100644
--- a/src/main/resources/csl-styles/animal-welfare.csl
+++ b/src/main/resources/csl-styles/animal-welfare.csl
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-GB" version="1.0" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Animal Welfare</title>
     <id>http://www.zotero.org/styles/animal-welfare</id>
     <link href="http://www.zotero.org/styles/animal-welfare" rel="self"/>
-    <link href="http://www.ufaw.org.uk/instructions-authors.php" rel="documentation"/>
+    <link href="https://www.ufaw.org.uk/the-ufaw-journal/instructions-for-authors" rel="documentation"/>
     <author>
       <name>Sjúrður Hammer</name>
       <uri>http://www.mendeley.com/profiles/sjurur-hammer/</uri>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>0962-7286</issn>
-    <updated>2015-07-27T13:15:14+00:00</updated>
+    <updated>2020-04-18T10:32:13+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="capitalize-first" font-style="normal" suffix=" "/>
+        <text term="in" text-case="capitalize-first" suffix=": "/>
         <names variable="editor translator" delimiter=", ">
           <name and="text" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-          <label form="short" prefix=" (" suffix=")"/>
+          <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
         </names>
       </if>
     </choose>
@@ -66,9 +69,12 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage">
-        <text variable="URL"/>
+      <if type="article-journal">
+        <text variable="DOI" prefix="https://doi.org/"/>
       </if>
+      <else-if type="webpage post post-weblog">
+        <text variable="URL"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="publisher">
@@ -135,7 +141,7 @@
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
         <text variable="container-title" form="long" font-style="italic" prefix=". "/>
-        <text variable="volume" font-weight="normal" prefix=" "/>
+        <text variable="volume" font-style="italic" prefix=" "/>
         <text variable="page" prefix=": " suffix="."/>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
@@ -177,7 +183,7 @@
       <text macro="author" font-weight="bold"/>
       <text macro="issued" suffix=" "/>
       <text variable="title"/>
-      <text macro="locators" font-weight="normal"/>
+      <text macro="locators"/>
       <text macro="edition" font-weight="bold"/>
       <group delimiter=". " prefix=". ">
         <text macro="publisher"/>
diff --git a/src/main/resources/csl-styles/apa-6th-edition.csl b/src/main/resources/csl-styles/apa-6th-edition.csl
index da2f966217b..83c3b70cce6 100644
--- a/src/main/resources/csl-styles/apa-6th-edition.csl
+++ b/src/main/resources/csl-styles/apa-6th-edition.csl
@@ -335,7 +335,7 @@
         <text macro="patent-number"/>
       </if>
       <else-if type="treaty">
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title"/>
       </else-if>
       <else-if type="personal_communication">
         <choose>
@@ -344,7 +344,7 @@
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text variable="title" form="short" text-case="title" quotes="true"/>
                 </substitute>
               </names>
               <!-- This should be localized -->
@@ -359,10 +359,10 @@
                 <names variable="translator"/>
                 <choose>
                   <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
-                    <text variable="title" form="short" font-style="italic"/>
+                    <text variable="title" form="short" text-case="title" font-style="italic"/>
                   </else>
                 </choose>
                 <text macro="format-short" prefix="[" suffix="]"/>
@@ -380,10 +380,10 @@
             <names variable="translator"/>
             <choose>
               <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -401,7 +401,7 @@
               <if variable="container-title">
                 <choose>
                   <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
                     <names variable="translator"/>
@@ -420,16 +420,16 @@
                 <text variable="title" font-style="italic"/>
               </else-if>
               <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
+                <text variable="title" form="short" text-case="title"/>
               </else-if>
               <else-if variable="reviewed-author" type="review review-book" match="any">
                 <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
               <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </else-if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -691,20 +691,20 @@
                 <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
                 <group delimiter=", ">
                   <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </if>
               <else>
                 <!-- This should be localized -->
                 <group delimiter=" ">
                   <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </else>
             </choose>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
           </else>
         </choose>
       </if>
diff --git a/src/main/resources/csl-styles/apa-annotated-bibliography.csl b/src/main/resources/csl-styles/apa-annotated-bibliography.csl
index 5a1fdff33cb..c35e3446a67 100644
--- a/src/main/resources/csl-styles/apa-annotated-bibliography.csl
+++ b/src/main/resources/csl-styles/apa-annotated-bibliography.csl
@@ -461,13 +461,13 @@
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
           <if variable="number container-title" match="none">
             <text variable="title" form="short" font-style="italic" text-case="title"/>
           </if>
           <else-if variable="title">
-            <text variable="title" form="short"/>
+            <text variable="title" form="short" text-case="title"/>
           </else-if>
           <else>
             <group delimiter=" ">
@@ -491,18 +491,18 @@
       </else-if>
       <else-if type="legislation treaty" match="any">
         <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title" />
       </else-if>
       <else-if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else-if>
       <else-if variable="container-title" match="any">
         <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title" />
       </else-if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else>
     </choose>
   </macro>
@@ -1127,11 +1127,11 @@
     <choose>
       <if variable="reviewed-title">
         <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
diff --git a/src/main/resources/csl-styles/apa-no-ampersand.csl b/src/main/resources/csl-styles/apa-no-ampersand.csl
index 48a1c7ac76e..bea8e85d779 100644
--- a/src/main/resources/csl-styles/apa-no-ampersand.csl
+++ b/src/main/resources/csl-styles/apa-no-ampersand.csl
@@ -461,13 +461,13 @@
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
           <if variable="number container-title" match="none">
             <text variable="title" form="short" font-style="italic" text-case="title"/>
           </if>
           <else-if variable="title">
-            <text variable="title" form="short"/>
+            <text variable="title" form="short" text-case="title"/>
           </else-if>
           <else>
             <group delimiter=" ">
@@ -491,18 +491,18 @@
       </else-if>
       <else-if type="legislation treaty" match="any">
         <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title" />
       </else-if>
       <else-if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else-if>
       <else-if variable="container-title" match="any">
         <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title" />
       </else-if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else>
     </choose>
   </macro>
@@ -1127,11 +1127,11 @@
     <choose>
       <if variable="reviewed-title">
         <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
diff --git a/src/main/resources/csl-styles/apa-no-doi-no-issue.csl b/src/main/resources/csl-styles/apa-no-doi-no-issue.csl
index 3c1d12571ec..b71c07b4aa7 100644
--- a/src/main/resources/csl-styles/apa-no-doi-no-issue.csl
+++ b/src/main/resources/csl-styles/apa-no-doi-no-issue.csl
@@ -336,7 +336,7 @@
         <text macro="patent-number"/>
       </if>
       <else-if type="treaty">
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title"/>
       </else-if>
       <else-if type="personal_communication">
         <choose>
@@ -345,7 +345,7 @@
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text variable="title" form="short" text-case="title" quotes="true"/>
                 </substitute>
               </names>
               <!-- This should be localized -->
@@ -360,10 +360,10 @@
                 <names variable="translator"/>
                 <choose>
                   <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
-                    <text variable="title" form="short" font-style="italic"/>
+                    <text variable="title" form="short" text-case="title" font-style="italic"/>
                   </else>
                 </choose>
                 <text macro="format-short" prefix="[" suffix="]"/>
@@ -381,10 +381,10 @@
             <names variable="translator"/>
             <choose>
               <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -402,7 +402,7 @@
               <if variable="container-title">
                 <choose>
                   <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
                     <names variable="translator"/>
@@ -421,16 +421,16 @@
                 <text variable="title" font-style="italic"/>
               </else-if>
               <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
+                <text variable="title" form="short" text-case="title"/>
               </else-if>
               <else-if variable="reviewed-author" type="review review-book" match="any">
                 <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
               <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </else-if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -706,20 +706,20 @@
                 <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
                 <group delimiter=", ">
                   <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </if>
               <else>
                 <!-- This should be localized -->
                 <group delimiter=" ">
                   <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </else>
             </choose>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
           </else>
         </choose>
       </if>
diff --git a/src/main/resources/csl-styles/apa-old-doi-prefix.csl b/src/main/resources/csl-styles/apa-old-doi-prefix.csl
index 02bbbaf90d4..1bba65f0061 100644
--- a/src/main/resources/csl-styles/apa-old-doi-prefix.csl
+++ b/src/main/resources/csl-styles/apa-old-doi-prefix.csl
@@ -336,7 +336,7 @@
         <text macro="patent-number"/>
       </if>
       <else-if type="treaty">
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title"/>
       </else-if>
       <else-if type="personal_communication">
         <choose>
@@ -345,7 +345,7 @@
               <names variable="author">
                 <name and="symbol" delimiter=", " initialize-with=". "/>
                 <substitute>
-                  <text variable="title" form="short" quotes="true"/>
+                  <text variable="title" form="short" text-case="title" quotes="true"/>
                 </substitute>
               </names>
               <!-- This should be localized -->
@@ -360,10 +360,10 @@
                 <names variable="translator"/>
                 <choose>
                   <if variable="container-title">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
-                    <text variable="title" form="short" font-style="italic"/>
+                    <text variable="title" form="short" text-case="title" font-style="italic"/>
                   </else>
                 </choose>
                 <text macro="format-short" prefix="[" suffix="]"/>
@@ -381,10 +381,10 @@
             <names variable="translator"/>
             <choose>
               <if variable="container-title">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -402,7 +402,7 @@
               <if variable="container-title">
                 <choose>
                   <if type="book entry entry-dictionary entry-encyclopedia">
-                    <text variable="title" form="short" quotes="true"/>
+                    <text variable="title" form="short" text-case="title" quotes="true"/>
                   </if>
                   <else>
                     <names variable="translator"/>
@@ -421,16 +421,16 @@
                 <text variable="title" font-style="italic"/>
               </else-if>
               <else-if type="bill legislation" match="any">
-                <text variable="title" form="short"/>
+                <text variable="title" form="short" text-case="title"/>
               </else-if>
               <else-if variable="reviewed-author" type="review review-book" match="any">
                 <text macro="format-short" prefix="[" suffix="]"/>
               </else-if>
               <else-if type="post post-weblog webpage" variable="container-title" match="any">
-                <text variable="title" form="short" quotes="true"/>
+                <text variable="title" form="short" text-case="title" quotes="true"/>
               </else-if>
               <else>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="title" form="short" text-case="title" font-style="italic"/>
               </else>
             </choose>
             <text macro="format-short" prefix="[" suffix="]"/>
@@ -692,20 +692,20 @@
                 <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
                 <group delimiter=", ">
                   <text variable="genre" text-case="capitalize-first"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </if>
               <else>
                 <!-- This should be localized -->
                 <group delimiter=" ">
                   <text value="Review of"/>
-                  <text variable="title" form="short" font-style="italic"/>
+                  <text variable="title" form="short" text-case="title" font-style="italic"/>
                 </group>
               </else>
             </choose>
           </if>
           <else>
-            <text variable="title" form="short" quotes="true"/>
+            <text variable="title" form="short" text-case="title" quotes="true"/>
           </else>
         </choose>
       </if>
diff --git a/src/main/resources/csl-styles/apa-single-spaced.csl b/src/main/resources/csl-styles/apa-single-spaced.csl
index 7c902d8ee75..56b775bf8c2 100644
--- a/src/main/resources/csl-styles/apa-single-spaced.csl
+++ b/src/main/resources/csl-styles/apa-single-spaced.csl
@@ -461,13 +461,13 @@
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
           <if variable="number container-title" match="none">
             <text variable="title" form="short" font-style="italic" text-case="title"/>
           </if>
           <else-if variable="title">
-            <text variable="title" form="short"/>
+            <text variable="title" form="short" text-case="title"/>
           </else-if>
           <else>
             <group delimiter=" ">
@@ -491,18 +491,18 @@
       </else-if>
       <else-if type="legislation treaty" match="any">
         <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title" />
       </else-if>
       <else-if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else-if>
       <else-if variable="container-title" match="any">
         <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title" />
       </else-if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else>
     </choose>
   </macro>
@@ -1127,11 +1127,11 @@
     <choose>
       <if variable="reviewed-title">
         <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
diff --git a/src/main/resources/csl-styles/apa-with-abstract.csl b/src/main/resources/csl-styles/apa-with-abstract.csl
index 6c28d7f889a..2b6c03d8575 100644
--- a/src/main/resources/csl-styles/apa-with-abstract.csl
+++ b/src/main/resources/csl-styles/apa-with-abstract.csl
@@ -461,13 +461,13 @@
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
           <if variable="number container-title" match="none">
             <text variable="title" form="short" font-style="italic" text-case="title"/>
           </if>
           <else-if variable="title">
-            <text variable="title" form="short"/>
+            <text variable="title" form="short" text-case="title"/>
           </else-if>
           <else>
             <group delimiter=" ">
@@ -491,18 +491,18 @@
       </else-if>
       <else-if type="legislation treaty" match="any">
         <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title" />
       </else-if>
       <else-if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else-if>
       <else-if variable="container-title" match="any">
         <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title" />
       </else-if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else>
     </choose>
   </macro>
@@ -1127,11 +1127,11 @@
     <choose>
       <if variable="reviewed-title">
         <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl
index 284e56ca1ce..0c788c2148b 100644
--- a/src/main/resources/csl-styles/apa.csl
+++ b/src/main/resources/csl-styles/apa.csl
@@ -461,13 +461,13 @@
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
           <if variable="number container-title" match="none">
             <text variable="title" form="short" font-style="italic" text-case="title"/>
           </if>
           <else-if variable="title">
-            <text variable="title" form="short"/>
+            <text variable="title" form="short" text-case="title"/>
           </else-if>
           <else>
             <group delimiter=" ">
@@ -491,18 +491,18 @@
       </else-if>
       <else-if type="legislation treaty" match="any">
         <!-- Legislation and treaties not italicized or quoted -->
-        <text variable="title" form="short"/>
+        <text variable="title" form="short" text-case="title" />
       </else-if>
       <else-if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else-if>
       <else-if variable="container-title" match="any">
         <!-- Other types are italicized or quoted based on presence of container-title. As in title macro. -->
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title" />
       </else-if>
       <else>
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title" />
       </else>
     </choose>
   </macro>
@@ -1127,11 +1127,11 @@
     <choose>
       <if variable="reviewed-title">
         <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] -->
-        <text variable="reviewed-title" form="short" font-style="italic"/>
+        <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/>
       </if>
       <else>
         <!-- Assume title is title of reviewed work -->
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else>
     </choose>
   </macro>
diff --git a/src/main/resources/csl-styles/isnad-dipnotlu.csl b/src/main/resources/csl-styles/isnad-dipnotlu.csl
index 03ac1faaaba..0cc1e0d750c 100644
--- a/src/main/resources/csl-styles/isnad-dipnotlu.csl
+++ b/src/main/resources/csl-styles/isnad-dipnotlu.csl
@@ -21,7 +21,7 @@
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <!--
-	ISNAD AUTHOR-DATE v.1.0
+	ISNAD FULL NOTES v.1.1
 
 	Document Type Mappings
 	ISNAD				CSL
@@ -395,6 +395,13 @@
       <else-if type="motion_picture" variable="genre" match="all">
         <text variable="title" text-case="title" font-style="italic"/>
       </else-if>
+      <else-if type="entry-dictionary">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="title" text-case="title" quotes="true"/>
+          </if>
+        </choose>
+      </else-if>
       <else>
         <text variable="title" text-case="title" quotes="true"/>
       </else>
@@ -557,6 +564,13 @@
       <else-if type="motion_picture" variable="genre" match="all">
         <text variable="title" font-style="italic" form="short"/>
       </else-if>
+      <else-if type="entry-dictionary">
+        <choose>
+          <if variable="author editor" match="none">
+            <text variable="title" text-case="title" quotes="true"/>
+          </if>
+        </choose>
+      </else-if>
       <else>
         <text variable="title" text-case="title" form="short" quotes="true"/>
       </else>
@@ -904,6 +918,24 @@
       </if>
     </choose>
   </macro>
+  <macro name="locators-dictionary">
+    <choose>
+      <if type="entry-dictionary">
+        <choose>
+          <if variable="author editor" match="none"/>
+          <else-if variable="title" match="all">
+            <group delimiter=", ">
+              <text variable="title" text-case="title" quotes="true"/>
+              <text macro="point-locators"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
   <macro name="event-note">
     <text variable="event"/>
   </macro>
@@ -1078,6 +1110,9 @@
           </else>
         </choose>
       </if>
+      <else-if type="entry-dictionary">
+        <text macro="locators-dictionary"/>
+      </else-if>
       <else-if variable="locator">
         <choose>
           <if locator="page verse book" match="none">
@@ -1106,7 +1141,7 @@
               <text variable="locator"/>
             </group>
           </if>
-          <else-if type="book graphic motion_picture report song chapter entry-encyclopedia entry-dictionary paper-conference" match="any">
+          <else-if type="book graphic motion_picture report song chapter entry-encyclopedia paper-conference" match="any">
             <group delimiter="/">
               <number variable="volume" form="numeric"/>
               <text variable="locator"/>
@@ -1139,9 +1174,12 @@
   </macro>
   <macro name="point-locators-join-with-comma">
     <choose>
-      <if type="article-journal article-magazine article-newspaper" match="none">
+      <if type="article-journal article-magazine article-newspaper entry-dictionary" match="none">
         <text macro="point-locators"/>
       </if>
+      <else-if type="entry-dictionary">
+        <text macro="locators-dictionary"/>
+      </else-if>
       <else-if variable="volume issue" match="none">
         <text macro="point-locators"/>
       </else-if>
@@ -1187,7 +1225,7 @@
   </macro>
   <macro name="locators-chapter">
     <choose>
-      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+      <if type="chapter entry-encyclopedia paper-conference" match="any">
         <choose>
           <if variable="author container-author" match="all"/>
           <else>
diff --git a/src/main/resources/csl-styles/isnad.csl b/src/main/resources/csl-styles/isnad.csl
index 4775d740c3d..7cd8e6599d4 100644
--- a/src/main/resources/csl-styles/isnad.csl
+++ b/src/main/resources/csl-styles/isnad.csl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded">
   <info>
-    <title>ISNAD</title>
-    <title-short>IAS</title-short>
+    <title>İSNAD Atıf Sistemi 1. Edisyon (dipnotlu)</title>
+    <title-short>İSNAD</title-short>
     <id>http://www.zotero.org/styles/isnad</id>
     <link href="http://www.zotero.org/styles/isnad" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <link href="http://www.isnadsistemi.org/" rel="documentation"/>
-    <link href="http://www.isnadsistemi.org/dosyalar/Isnad_Atif_Sistemi_12-3-2018.pdf" rel="documentation"/>
+    <link href="http://www.isnadsistemi.org/guide" rel="documentation"/>
     <author>
       <name>Muhammet Tarakçı</name>
       <email>muhammettarakci@gmail.com</email>
diff --git a/src/main/resources/csl-styles/le-tapuscrit-author-date.csl b/src/main/resources/csl-styles/le-tapuscrit-author-date.csl
index b73025567eb..6fd3bc43acf 100644
--- a/src/main/resources/csl-styles/le-tapuscrit-author-date.csl
+++ b/src/main/resources/csl-styles/le-tapuscrit-author-date.csl
@@ -288,7 +288,7 @@
     <text variable="collection-title" quotes="true" prefix=" (coll.&#160;" suffix=")"/>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
-    <layout prefix="&#160;(" suffix=")" delimiter="; ">
+    <layout prefix="(" suffix=")" delimiter="; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
diff --git a/src/main/resources/csl-styles/mammalia.csl b/src/main/resources/csl-styles/mammalia.csl
new file mode 100644
index 00000000000..835adb264b1
--- /dev/null
+++ b/src/main/resources/csl-styles/mammalia.csl
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US">
+  <info>
+    <title>Mammalia</title>
+    <id>http://www.zotero.org/styles/mammalia</id>
+    <link href="http://www.zotero.org/styles/mammalia" rel="self"/>
+    <link href="http://www.zotero.org/styles/genetics" rel="template"/>
+    <link href="https://www.degruyter.com/view/journals/mamm/mamm-overview.xml?tab_body=editorialContent-68857" rel="documentation"/>
+    <link href="http://www.degruyter.com/view/supplement/s18641547_Instructions_for_Authors.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>0025-1461</issn>
+    <eissn>1864-1547</eissn>
+    <updated>2020-04-20T10:34:52+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
+      <name and="text" delimiter-precedes-last="always" initialize-with="." sort-separator=" "/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize-with="." name-as-sort-order="first" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation collapse="year-suffix" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="issued"/>
+      <key variable="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator" prefix=" "/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <date date-parts="year" form="text" variable="issued"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group>
+              <text macro="title"/>
+              <text macro="editor-translator"/>
+            </group>
+            <text prefix=" " suffix="." macro="publisher"/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <names variable="editor translator" prefix="(" suffix=")">
+                    <name prefix=" " initialize-with=". " name-as-sort-order="all" sort-separator=" "/>
+                    <label form="short" prefix=", "/>
+                  </names>
+                </group>
+                <group delimiter=", ">
+                  <text variable="container-title"/>
+                  <text variable="collection-title"/>
+                </group>
+              </group>
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="editor-translator"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="container-title" form="short"/>
+                <group delimiter=": ">
+                  <text variable="volume"/>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/src/main/resources/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl b/src/main/resources/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
index 6c3fac2a5b7..49efc26847e 100644
--- a/src/main/resources/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
+++ b/src/main/resources/csl-styles/masarykova-univerzita-pravnicka-fakulta.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="sort-only" initialize-with-hyphen="true" default-locale="cs-CZ">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="sort-only" initialize-with-hyphen="true">
   <info>
-    <title>Masarykova univerzita - Právnická fakulta (Czech)</title>
+    <title>Masarykova univerzita - Právnická fakulta</title>
     <id>http://www.zotero.org/styles/masarykova-univerzita-pravnicka-fakulta</id>
     <link href="http://www.zotero.org/styles/masarykova-univerzita-pravnicka-fakulta" rel="self"/>
     <link href="http://www.zotero.org/styles/iso690-full-note-cs" rel="template"/>
@@ -14,20 +14,32 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Masaryk University, Faculty of Law</summary>
-    <updated>2020-04-13T10:00:00+00:00</updated>
+    <updated>2020-04-18T10:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="cs">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="accessed" form="short">cit.</term>
       <term name="editor" form="short">
         <single>ed.</single>
-        <multiple>eds</multiple>
+        <multiple>eds.</multiple>
       </term>
-      <term name="in">in:</term>
-      <term name="page-range-delimiter">-</term>
     </terms>
   </locale>
+  <macro name="page-range">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator-or-period">
+    <choose>
+      <if variable="locator" match="none">
+        <text value="."/>
+      </if>
+      <else>
+        <text prefix=", " macro="citation-locator" suffix="."/>
+      </else>
+    </choose>
+  </macro>
   <macro name="contributors-full">
     <choose>
       <if variable="author">
@@ -159,7 +171,7 @@
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
         <choose>
           <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
-            <text term="in" text-case="capitalize-first" suffix=" "/>
+            <text term="in" text-case="capitalize-first" suffix=": "/>
           </if>
         </choose>
         <text macro="container-contributors" suffix=" "/>
@@ -189,7 +201,7 @@
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
         <choose>
           <if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
-            <text term="in" text-case="capitalize-first" suffix=" "/>
+            <text term="in" text-case="capitalize-first" suffix=": "/>
           </if>
         </choose>
         <text macro="container-contributors-full" suffix=" "/>
@@ -321,7 +333,8 @@
     </choose>
   </macro>
   <macro name="quoted">
-    <group prefix="[cit. " suffix="]">
+    <group prefix="[" suffix="]">
+      <text term="accessed" form="short" suffix=". "/>
       <date variable="accessed">
         <date-part name="day" suffix=". "/>
         <date-part name="month" suffix=". " form="numeric"/>
@@ -344,14 +357,7 @@
         <else-if position="subsequent">
           <text macro="contributors-short" suffix=". "/>
           <text macro="title-short" font-style="italic"/>
-          <choose>
-            <if variable="locator">
-              <text prefix=", " macro="citation-locator" suffix="."/>
-            </if>
-            <else-if variable="accessed URL DOI" match="any">
-              <text term="online" prefix=" [" suffix="]."/>
-            </else-if>
-          </choose>
+          <text macro="locator-or-period"/>
         </else-if>
         <else>
           <choose>
@@ -359,10 +365,10 @@
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" suffix=". "/>
               <text macro="container"/>
+              <text prefix=". " variable="volume" text-case="capitalize-first"/>
               <choose>
                 <if variable="accessed DOI URL" match="any">
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier" suffix="."/>
@@ -373,26 +379,11 @@
                       <text prefix=". " macro="publisher"/>
                     </if>
                   </choose>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else-if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </if>
@@ -417,14 +408,7 @@
                 </if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
@@ -440,41 +424,30 @@
                   <text prefix=". " macro="identifier" suffix="."/>
                 </if>
                 <else>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <text prefix=" " macro="medium"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " variable="genre"/>
+              <text prefix=", " variable="publisher"/>
+              <text macro="locator-or-period"/>
+            </else-if>
             <else>
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" font-style="italic"/>
               <text prefix=" " macro="medium"/>
               <choose>
-                <if type="thesis" match="any">
-                  <text prefix=". " macro="issued"/>
-                  <text prefix=", " variable="genre"/>
-                  <text prefix=", " variable="publisher"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
-                </if>
-                <else-if variable="accessed DOI URL" match="any">
+                <if variable="accessed DOI URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier" suffix="."/>
-                </else-if>
+                </if>
                 <else-if variable="issued" match="none">
                   <choose>
                     <if variable="publisher publisher-place" match="any">
@@ -519,12 +492,12 @@
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" suffix=". "/>
           <text macro="container-full"/>
+          <text prefix=". " variable="volume" text-case="capitalize-first"/>
           <choose>
             <if variable="accessed DOI URL" match="any">
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="identifier" suffix="."/>
@@ -537,17 +510,14 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
             </else-if>
             <else>
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
             </else>
           </choose>
@@ -567,14 +537,12 @@
           <text prefix=". " macro="issued"/>
           <choose>
             <if variable="accessed DOI URL" match="any">
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="identifier" suffix="."/>
             </if>
             <else>
-              <text prefix=", s. " variable="page" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
             </else>
           </choose>
         </else-if>
@@ -585,38 +553,36 @@
           <text prefix=". " macro="issued"/>
           <choose>
             <if variable="accessed DOI URL" match="any">
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="identifier" suffix="."/>
             </if>
             <else>
-              <text prefix=", s. " variable="page" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
             </else>
           </choose>
         </else-if>
+        <else-if type="thesis" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <text prefix=" " macro="medium"/>
+          <text prefix=". " macro="issued"/>
+          <text prefix=", " variable="genre"/>
+          <text prefix=", " variable="publisher" suffix="."/>
+        </else-if>
         <else>
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" font-style="italic"/>
           <choose>
-            <if type="thesis" match="any">
-              <text prefix=" " macro="medium"/>
-              <text prefix=". " macro="issued"/>
-              <text prefix=", " variable="genre"/>
-              <text prefix=", " variable="publisher"/>
-              <text prefix=", " variable="number-of-pages" suffix=" s."/>
-            </if>
-            <else-if variable="accessed DOI URL" match="any">
+            <if variable="accessed DOI URL" match="any">
               <text prefix=" " macro="medium"/>
               <text prefix=". " macro="secondary-contributors"/>
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued"/>
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="identifier" suffix="."/>
-            </else-if>
+            </if>
             <else-if variable="issued" match="none">
               <text prefix=" " macro="medium" suffix="."/>
               <choose>
@@ -625,14 +591,12 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
             </else-if>
             <else>
               <text prefix=" " macro="medium" suffix="."/>
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
             </else>
           </choose>
         </else>
diff --git a/src/main/resources/csl-styles/norois.csl b/src/main/resources/csl-styles/norois.csl
index 01f793c4c9c..8c634fa23d9 100644
--- a/src/main/resources/csl-styles/norois.csl
+++ b/src/main/resources/csl-styles/norois.csl
@@ -13,7 +13,7 @@
     <category field="geography"/>
     <issn>0029-182X</issn>
     <eissn>1760-8546</eissn>
-    <updated>2020-04-14T10:19:50+00:00</updated>
+    <updated>2020-04-15T09:55:52+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -116,7 +116,7 @@
       <else>
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix="DOI: "/>
+            <text variable="DOI" prefix="DOI : "/>
           </if>
           <else>
             <group delimiter=" ">
@@ -503,7 +503,7 @@
     </sort>
     <layout>
       <group suffix=".">
-        <group delimiter=". ">
+        <group delimiter=", ">
           <group delimiter=", ">
             <text macro="author"/>
             <text macro="issued"/>
diff --git a/src/main/resources/csl-styles/research-and-education-promotion-association.csl b/src/main/resources/csl-styles/research-and-education-promotion-association.csl
new file mode 100644
index 00000000000..b32a73f8501
--- /dev/null
+++ b/src/main/resources/csl-styles/research-and-education-promotion-association.csl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>Research and Education Promotion Association</title>
+    <title-short>REPA</title-short>
+    <id>http://www.zotero.org/styles/research-and-education-promotion-association</id>
+    <link href="http://www.zotero.org/styles/research-and-education-promotion-association" rel="self"/>
+    <link href="https://repa.jp/journals/editorial-guide-and-citation-style/" rel="documentation"/>
+    <author>
+      <name>Research and Education Promotion Association (REPA)</name>
+      <email>editorial@repa.jp</email>
+      <uri>www.repa.jp</uri>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <updated>2020-04-18T14:45:25+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor" font-style="italic" delimiter=", ">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label prefix=" - "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author" delimiter=", ">
+      <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label prefix=": "/>
+      <substitute>
+        <names variable="editor" suffix=" "/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <choose>
+        <if variable="URL">
+          <text variable="URL" prefix="(" suffix=") "/>
+          <group prefix=" ">
+            <text term="accessed" text-case="capitalize-first" font-style="italic" suffix=": "/>
+            <date variable="accessed" font-style="italic" font-weight="normal">
+              <date-part name="day" font-weight="normal" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year" font-weight="bold"/>
+            </date>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher" font-style="italic"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued" font-weight="bold">
+          <date-part name="year" font-weight="bold"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="5" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="] "/>
+      <group delimiter=" ">
+        <text macro="author" suffix=" "/>
+        <text macro="year-date" prefix="(" suffix=")"/>
+        <text variable="title" quotes="true" prefix=" "/>
+      </group>
+      <choose>
+        <if type="book report" match="any">
+          <text macro="edition" prefix=", "/>
+          <text variable="genre" font-style="italic" prefix=" "/>
+          <group delimiter=" " prefix=" ">
+            <text macro="editor"/>
+            <text macro="publisher" suffix=". "/>
+            <group delimiter=" ">
+              <text variable="number-of-pages"/>
+              <text term="page" form="short" strip-periods="true" suffix="."/>
+              <text variable="ISBN" form="short" font-style="normal" font-weight="bold" prefix="ISBN: "/>
+            </group>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=". " suffix=" ">
+            <group delimiter=" " prefix=" ">
+              <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
+              <text macro="editor"/>
+            </group>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="normal" prefix=" " suffix=" "/>
+              <text macro="edition"/>
+            </group>
+          </group>
+          <group delimiter=", " prefix=" " suffix=" - ">
+            <text macro="publisher"/>
+            <text variable="volume" prefix="vol. "/>
+          </group>
+          <text variable="page" prefix=" pp. " suffix="."/>
+          <text variable="DOI" prefix=" https://doi.org/"/>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=" " prefix=" ">
+            <text variable="genre" prefix="(" suffix=") "/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" " prefix=" ">
+            <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
+            <group prefix=" (" suffix=")">
+              <text variable="volume" prefix="vol. " suffix=", "/>
+              <text variable="issue" prefix="no. " suffix=", "/>
+              <text variable="page" prefix="pp. "/>
+            </group>
+          </group>
+          <text variable="DOI" text-decoration="none" prefix=" https://doi.org/"/>
+        </else>
+      </choose>
+      <text macro="access" prefix=" "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/src/main/resources/csl-styles/society-for-american-archaeology.csl b/src/main/resources/csl-styles/society-for-american-archaeology.csl
index a92dd15abc6..376552ee8b6 100644
--- a/src/main/resources/csl-styles/society-for-american-archaeology.csl
+++ b/src/main/resources/csl-styles/society-for-american-archaeology.csl
@@ -21,7 +21,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="anthropology"/>
-    <updated>2020-04-09T13:02:18+00:00</updated>
+    <updated>2020-04-17T09:23:48+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
@@ -316,7 +316,6 @@
             </if>
           </choose>
           <text macro="publisher"/>
-          <text macro="day-month"/>
         </group>
       </else>
     </choose>
diff --git a/src/main/resources/csl-styles/the-febs-journal.csl b/src/main/resources/csl-styles/the-febs-journal.csl
index 530c4484aa0..82c8fa77536 100644
--- a/src/main/resources/csl-styles/the-febs-journal.csl
+++ b/src/main/resources/csl-styles/the-febs-journal.csl
@@ -14,7 +14,7 @@
     <issn>1742-464X</issn>
     <eissn>1742-4658</eissn>
     <summary>Style for FEBS Journal</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2020-04-21T19:53:31+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
@@ -108,7 +108,7 @@
         <else>
           <group prefix=" " suffix=".">
             <text macro="title" suffix=". "/>
-            <text variable="container-title" form="short" font-style="italic"/>
+            <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
             <group prefix=" ">
               <text variable="volume" font-weight="bold"/>
             </group>
diff --git a/src/main/resources/csl-styles/the-oncologist.csl b/src/main/resources/csl-styles/the-oncologist.csl
index ad11a52a59d..498cde23704 100644
--- a/src/main/resources/csl-styles/the-oncologist.csl
+++ b/src/main/resources/csl-styles/the-oncologist.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/the-oncologist</id>
     <link href="http://www.zotero.org/styles/the-oncologist" rel="self"/>
     <link href="http://www.zotero.org/styles/the-lancet" rel="template"/>
-    <link href="http://theoncologist.alphamedpress.org/site/misc/TO_references.pdf" rel="documentation"/>
+    <link href="https://theoncologist.onlinelibrary.wiley.com/page/journal/1549490x/homepage/for_authors" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
@@ -14,12 +14,12 @@
     <issn>1083-7159</issn>
     <eissn>1549-490X</eissn>
     <summary>Vancouver style adapted for The Oncologist</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2020-04-22T20:32:58+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
     <names variable="author" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" delimiter-precedes-et-al="never"/>
       <label form="short" prefix=", "/>
       <substitute>
         <names variable="editor"/>
@@ -28,7 +28,7 @@
   </macro>
   <macro name="editor">
     <names variable="editor" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <name initialize-with="" name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" delimiter-precedes-et-al="never"/>
       <label form="short" prefix=", "/>
     </names>
   </macro>
diff --git a/src/main/resources/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl b/src/main/resources/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
index 5e148ee2043..054c3a94128 100644
--- a/src/main/resources/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
+++ b/src/main/resources/csl-styles/universite-de-bordeaux-ecole-doctorale-de-droit.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0" page-range-format="expanded" demote-non-dropping-particle="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" demote-non-dropping-particle="never" default-locale="fr-FR">
   <info>
     <title>Université de Bordeaux - École doctorale de droit (French)</title>
     <id>http://www.zotero.org/styles/universite-de-bordeaux-ecole-doctorale-de-droit</id>
@@ -16,7 +16,7 @@
     </author>
     <category citation-format="note"/>
     <category field="law"/>
-    <updated>2019-04-03T15:47:26+00:00</updated>
+    <updated>2019-11-07T04:39:48+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -660,11 +660,29 @@
           <text term="ibid" text-case="capitalize-first" font-style="italic"/>
         </else-if>
         <else-if position="near-note" match="any">
-          <group delimiter=", ">
-            <text macro="author"/>
-            <text term="cited" font-style="italic"/>
-            <text macro="locator"/>
-          </group>
+          <choose>
+            <if variable="author editor" match="none">
+              <group delimiter=", ">
+                <text macro="authority"/>
+                <text macro="case-patent-ref"/>
+                <text macro="author"/>
+                <text macro="title-short"/>
+                <text macro="container-title-short"/>
+                <text macro="thesis-genre"/>
+                <text macro="publisher"/>
+                <text macro="issued-short"/>
+                <text macro="locator"/>
+                <text macro="access-date"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <text macro="author"/>
+                <text term="cited" font-style="italic"/>
+                <text macro="locator"/>
+              </group>
+            </else>
+          </choose>
         </else-if>
         <else>
           <group delimiter=", ">
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 777acd7b11c..307da666806 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -260,7 +260,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=Dynamically gr
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=Dynamically group entries by searching a field for a keyword
 
-Each\ line\ must\ be\ of\ the\ following\ form=Each line must be of the following form
+Each\ line\ must\ be\ of\ the\ following\ form\:\ \'tab\:field1;field2;...;fieldN\'.=Each line must be of the following form\: 'tab\:field1;field2;...;fieldN'.
 
 Edit=Edit
 
@@ -331,7 +331,8 @@ Field=Field
 field=field
 
 Field\ name=Field name
-Field\ names\ are\ not\ allowed\ to\ contain\ white\ space\ or\ the\ following\ characters=Field names are not allowed to contain white space or the following characters
+
+Field\ names\ are\ not\ allowed\ to\ contain\ white\ spaces\ or\ certain\ characters\ (%0).=Field names are not allowed to contain white spaces or certain characters (%0).
 
 Field\ to\ group\ by=Field to group by
 
@@ -827,7 +828,6 @@ Sublibrary\ from\ AUX\ to\ BibTeX=Sublibrary from AUX to BibTeX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Switches between full and abbreviated journal name if the journal name is known.
 
-Tabname=Tabname
 Tertiary\ sort\ criterion=Tertiary sort criterion
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=The chosen encoding '%0' could not encode the following characters:
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
index 6237103e62e..a21e086e326 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java
@@ -47,6 +47,11 @@ public static void doNotUseGlyphsDirectly(JavaClasses classes) {
         noClasses().that().resideOutsideOfPackage("org.jabref.gui.icon").should().accessClassesThat().resideInAnyPackage("de.jensd.fx.glyphs", "de.jensd.fx.glyphs.materialdesignicons").check(classes);
     }
 
+    @ArchTest
+    public static void doNotUseAssertJ(JavaClasses classes) {
+        noClasses().should().accessClassesThat().resideInAPackage("org.assertj..").check(classes);
+    }
+
     // "Currently disabled as there is no alternative for the rest of classes who need awt"
     @ArchIgnore
     @ArchTest
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index 283de46541b..512beaf6c6a 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -6,7 +6,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.preferences.JabRefPreferences;
 
@@ -40,7 +40,7 @@ void setUp() {
 
     @Test
     void updateTimestampEnabled() {
-        final Field timestampField = InternalField.TIMESTAMP;
+        final Field timestampField = StandardField.TIMESTAMP;
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
 
@@ -63,7 +63,7 @@ void updateTimestampEnabled() {
 
     @Test
     void updateTimestampDisabled() {
-        final Field timestampField = InternalField.TIMESTAMP;
+        final Field timestampField = StandardField.TIMESTAMP;
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
 
diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
index 099f6cab1af..8843b932c82 100644
--- a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -13,107 +14,101 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class BibEntrySuggestionProviderTest {
+class BibEntrySuggestionProviderTest {
 
     private BibEntrySuggestionProvider autoCompleter;
+    private BibDatabase database;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        autoCompleter = new BibEntrySuggestionProvider();
+    void setUp() throws Exception {
+        database = new BibDatabase();
+        autoCompleter = new BibEntrySuggestionProvider(database);
     }
 
     @Test
-    public void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("test")));
+    void completeWithoutAddingAnythingReturnsNothing() {
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingNullReturnsNothing() {
-        autoCompleter.indexEntry(null);
-
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("test")));
-        assertEquals(Collections.emptyList(), result);
-    }
-
-    @Test
-    public void completeAfterAddingEmptyEntryReturnsNothing() {
+    void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("test")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeKeyReturnsKey() {
+    void completeKeyReturnsKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("testKey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testKey")));
         assertEquals(Collections.singletonList(entry), result);
     }
 
     @Test
-    public void completeBeginnigOfKeyReturnsKey() {
+    void completeBeginningOfKeyReturnsKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("test")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.singletonList(entry), result);
     }
 
     @Test
-    public void completeLowercaseKeyReturnsKey() {
+    void completeLowercaseKeyReturnsKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("testkey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testkey")));
         assertEquals(Collections.singletonList(entry), result);
     }
 
     @Test
-    public void completeNullThrowsException() {
+    void completeNullThrowsException() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.call(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
     }
 
     @Test
-    public void completeEmptyStringReturnsNothing() {
+    void completeEmptyStringReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeReturnsMultipleResults() {
+    void completeReturnsMultipleResults() {
         BibEntry entryOne = new BibEntry();
         entryOne.setCiteKey("testKeyOne");
-        autoCompleter.indexEntry(entryOne);
+        database.insertEntry(entryOne);
         BibEntry entryTwo = new BibEntry();
         entryTwo.setCiteKey("testKeyTwo");
-        autoCompleter.indexEntry(entryTwo);
+        database.insertEntry(entryTwo);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("testKey")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("testKey")));
         assertEquals(Arrays.asList(entryTwo, entryOne), result);
     }
 
     @Test
-    public void completeShortKeyReturnsKey() {
+    void completeShortKeyReturnsKey() {
         BibEntry entry = new BibEntry();
         entry.setCiteKey("key");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.call(getRequest(("k")));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(("k")));
         assertEquals(Collections.singletonList(entry), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
index f99b4de1b85..8d833b199aa 100644
--- a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
@@ -14,142 +15,136 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class DefaultAutoCompleterTest {
+class DefaultAutoCompleterTest {
 
     private WordSuggestionProvider autoCompleter;
-
-    @Test
-    public void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new WordSuggestionProvider(null));
-    }
+    private BibDatabase database;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        autoCompleter = new WordSuggestionProvider(StandardField.TITLE);
+    void setUp() throws Exception {
+        database = new BibDatabase();
+        autoCompleter = new WordSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
-    public void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
-        assertEquals(Collections.emptyList(), result);
+    void initAutoCompleterWithNullFieldThrowsException() {
+        assertThrows(NullPointerException.class, () -> new WordSuggestionProvider(null, database));
     }
 
     @Test
-    public void completeAfterAddingNullReturnsNothing() {
-        autoCompleter.indexEntry(null);
-
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+    void completeWithoutAddingAnythingReturnsNothing() {
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingEmptyEntryReturnsNothing() {
+    void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingEntryWithoutFieldReturnsNothing() {
+    void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "testAuthor");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeValueReturnsValue() {
+    void completeValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeBeginningOfValueReturnsValue() {
+    void completeBeginningOfValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeLowercaseValueReturnsValue() {
+    void completeLowercaseValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testvalue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testvalue")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeNullThrowsException() {
+    void completeNullThrowsException() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.call(getRequest((null))));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
     }
 
     @Test
-    public void completeEmptyStringReturnsNothing() {
+    void completeEmptyStringReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeReturnsMultipleResults() {
+    void completeReturnsMultipleResults() {
         BibEntry entryOne = new BibEntry();
         entryOne.setField(StandardField.TITLE, "testValueOne");
-        autoCompleter.indexEntry(entryOne);
+        database.insertEntry(entryOne);
         BibEntry entryTwo = new BibEntry();
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
-        autoCompleter.indexEntry(entryTwo);
+        database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
     @Test
-    public void completeShortStringReturnsValue() {
+    void completeShortStringReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "val");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("va")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("va")));
         assertEquals(Collections.singletonList("val"), result);
     }
 
     @Test
-    public void completeBeginnigOfSecondWordReturnsWord() {
+    void completeBeginnigOfSecondWordReturnsWord() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "test value");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("val")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("val")));
         assertEquals(Collections.singletonList("value"), result);
     }
 
     @Test
-    public void completePartOfWordReturnsValue() {
+    void completePartOfWordReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "test value");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("lue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("lue")));
         assertEquals(Collections.singletonList("value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
index 51ef4e8e988..99d5728fb03 100644
--- a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
@@ -14,152 +15,146 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class FieldValueSuggestionProviderTest {
+class FieldValueSuggestionProviderTest {
 
     private FieldValueSuggestionProvider autoCompleter;
+    private BibDatabase database;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        autoCompleter = new FieldValueSuggestionProvider(StandardField.TITLE);
+    void setUp() throws Exception {
+        database = new BibDatabase();
+        autoCompleter = new FieldValueSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
-    public void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new FieldValueSuggestionProvider(null));
+    void initAutoCompleterWithNullFieldThrowsException() {
+        assertThrows(NullPointerException.class, () -> new FieldValueSuggestionProvider(null, new BibDatabase()));
     }
 
     @Test
-    public void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+    void completeWithoutAddingAnythingReturnsNothing() {
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingNullReturnsNothing() {
-        autoCompleter.indexEntry(null);
-
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
-        assertEquals(Collections.emptyList(), result);
-    }
-
-    @Test
-    public void completeAfterAddingEmptyEntryReturnsNothing() {
+    void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingEntryWithoutFieldReturnsNothing() {
+    void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "testAuthor");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeValueReturnsValue() {
+    void completeValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeBeginnigOfValueReturnsValue() {
+    void completeBeginnigOfValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("test")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeLowercaseValueReturnsValue() {
+    void completeLowercaseValueReturnsValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testvalue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testvalue")));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
     @Test
-    public void completeNullThrowsException() {
+    void completeNullThrowsException() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.call(getRequest(null)));
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
     }
 
     @Test
-    public void completeEmptyStringReturnsNothing() {
+    void completeEmptyStringReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testKey");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeReturnsMultipleResults() {
+    void completeReturnsMultipleResults() {
         BibEntry entryOne = new BibEntry();
         entryOne.setField(StandardField.TITLE, "testValueOne");
-        autoCompleter.indexEntry(entryOne);
+        database.insertEntry(entryOne);
         BibEntry entryTwo = new BibEntry();
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
-        autoCompleter.indexEntry(entryTwo);
+        database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.call(getRequest(("testValue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("testValue")));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
     @Test
-    public void completeShortStringReturnsFieldValue() {
+    void completeShortStringReturnsFieldValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "val");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("va")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("va")));
         assertEquals(Collections.singletonList("val"), result);
     }
 
     @Test
-    public void completeBeginnigOfSecondWordReturnsWholeFieldValue() {
+    void completeBeginnigOfSecondWordReturnsWholeFieldValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "test value");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("val")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("val")));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
     @Test
-    public void completePartOfWordReturnsWholeFieldValue() {
+    void completePartOfWordReturnsWholeFieldValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "test value");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("lue")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("lue")));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
     @Test
-    public void completeReturnsWholeFieldValue() {
+    void completeReturnsWholeFieldValue() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "test value");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.call(getRequest(("te")));
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(("te")));
         assertEquals(Collections.singletonList("test value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
index ccc681febdd..1c3f344f5da 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -16,174 +17,168 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class PersonNameSuggestionProviderTest {
+class PersonNameSuggestionProviderTest {
 
     private final Author vassilisKostakos = new Author("Vassilis", "V.", "", "Kostakos", "");
     private PersonNameSuggestionProvider autoCompleter;
     private BibEntry entry;
-
-    @Test
-    public void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new PersonNameSuggestionProvider((Field) null));
-    }
+    private BibDatabase database;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        autoCompleter = new PersonNameSuggestionProvider(StandardField.AUTHOR);
+    void setUp() throws Exception {
+        database = new BibDatabase();
+        autoCompleter = new PersonNameSuggestionProvider(StandardField.AUTHOR, database);
 
         entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
     }
 
     @Test
-    public void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<Author> result = autoCompleter.call(getRequest(("test")));
-        assertEquals(Collections.emptyList(), result);
+    void initAutoCompleterWithNullFieldThrowsException() {
+        assertThrows(NullPointerException.class, () -> new PersonNameSuggestionProvider((Field) null, new BibDatabase()));
     }
 
     @Test
-    public void completeAfterAddingNullReturnsNothing() {
-        autoCompleter.indexEntry(null);
-
-        Collection<Author> result = autoCompleter.call(getRequest(("test")));
+    void completeWithoutAddingAnythingReturnsNothing() {
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingEmptyEntryReturnsNothing() {
+    void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("test")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeAfterAddingEntryWithoutFieldReturnsNothing() {
+    void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testTitle");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("test")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("test")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeNameReturnsName() {
-        autoCompleter.indexEntry(entry);
+    void completeNameReturnsName() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Kostakos")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kostakos")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
-    public void completeBeginningOfNameReturnsName() {
-        autoCompleter.indexEntry(entry);
+    void completeBeginningOfNameReturnsName() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Kosta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kosta")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
-    public void completeLowercaseBeginningOfNameReturnsName() {
-        autoCompleter.indexEntry(entry);
+    void completeLowercaseBeginningOfNameReturnsName() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("kosta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("kosta")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
-    public void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.call(getRequest((null))));
+    void completeNullThrowsException() {
+        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest((null))));
     }
 
     @Test
-    public void completeEmptyStringReturnsNothing() {
-        autoCompleter.indexEntry(entry);
+    void completeEmptyStringReturnsNothing() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("")));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
-    public void completeReturnsMultipleResults() {
-        autoCompleter.indexEntry(entry);
+    void completeReturnsMultipleResults() {
+        database.insertEntry(entry);
         BibEntry entryTwo = new BibEntry();
         entryTwo.setField(StandardField.AUTHOR, "Kosta");
-        autoCompleter.indexEntry(entryTwo);
+        database.insertEntry(entryTwo);
         Author authorTwo = new Author("", "", "", "Kosta", "");
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Ko")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Ko")));
         assertEquals(Arrays.asList(authorTwo, vassilisKostakos), result);
     }
 
     @Test
-    public void completePartOfNameReturnsName() {
-        autoCompleter.indexEntry(entry);
+    void completePartOfNameReturnsName() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("osta")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("osta")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
-    public void completeBeginningOfFirstNameReturnsName() {
-        autoCompleter.indexEntry(entry);
+    void completeBeginningOfFirstNameReturnsName() {
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Vas")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Vas")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
-    public void completeBeginningOfFirstNameReturnsNameWithJr() {
+    void completeBeginningOfFirstNameReturnsNameWithJr() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Reagle, Jr., Joseph M.");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
         Author author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Jos")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Jos")));
         assertEquals(Collections.singletonList(author), result);
     }
 
     @Test
-    public void completeBeginningOfFirstNameReturnsNameWithVon() {
+    void completeBeginningOfFirstNameReturnsNameWithVon() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Eric von Hippel");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Eric")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Eric")));
         assertEquals(Collections.singletonList(author), result);
     }
 
     @Test
-    public void completeBeginningOfLastNameReturnsNameWithUmlauts() {
+    void completeBeginningOfLastNameReturnsNameWithUmlauts() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Honig Bär");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
         Author author = new Author("Honig", "H.", "", "Bär", "");
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Bä")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Bä")));
         assertEquals(Collections.singletonList(author), result);
     }
 
     @Test
-    public void completeVonReturnsName() {
+    void completeVonReturnsName() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Eric von Hippel");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.call(getRequest(("von")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("von")));
         assertEquals(Collections.singletonList(author), result);
     }
 
     @Test
-    public void completeBeginningOfFullNameReturnsName() {
+    void completeBeginningOfFullNameReturnsName() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
-        autoCompleter.indexEntry(entry);
+        database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.call(getRequest(("Kostakos, Va")));
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(("Kostakos, Va")));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
index 4f5c437e800..d9bc547941c 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/IdentifierEditorViewModelTest.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
 import org.jabref.gui.DialogService;
-import org.jabref.gui.autocompleter.WordSuggestionProvider;
+import org.jabref.gui.autocompleter.EmptySuggestionProvider;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.field.StandardField;
@@ -12,17 +12,17 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-public class IdentifierEditorViewModelTest {
+class IdentifierEditorViewModelTest {
 
     private IdentifierEditorViewModel viewModel;
 
     @BeforeEach
-    public void setUp() throws Exception {
-        viewModel = new IdentifierEditorViewModel(StandardField.DOI, new WordSuggestionProvider(StandardField.DOI), new CurrentThreadTaskExecutor(), mock(DialogService.class), mock(FieldCheckers.class));
+    void setUp() throws Exception {
+        viewModel = new IdentifierEditorViewModel(StandardField.DOI, new EmptySuggestionProvider(), new CurrentThreadTaskExecutor(), mock(DialogService.class), mock(FieldCheckers.class));
     }
 
     @Test
-    public void validIdentifierIsNotPresentIsTrueForEmptyText() throws Exception {
+    void validIdentifierIsNotPresentIsTrueForEmptyText() throws Exception {
         assertTrue(viewModel.validIdentifierIsNotPresentProperty().get());
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index 90af41c477c..c3bfb662aaf 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -12,7 +12,6 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.model.groups.AutomaticKeywordGroup;
@@ -29,7 +28,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class GroupNodeViewModelTest {
+class GroupNodeViewModelTest {
 
     private StateManager stateManager;
     private BibDatabaseContext databaseContext;
@@ -37,7 +36,7 @@ public class GroupNodeViewModelTest {
     private TaskExecutor taskExecutor;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         stateManager = mock(StateManager.class);
         when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
         databaseContext = new BibDatabaseContext();
@@ -48,24 +47,24 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void getDisplayNameConvertsLatexToUnicode() throws Exception {
+    void getDisplayNameConvertsLatexToUnicode() throws Exception {
         GroupNodeViewModel viewModel = getViewModelForGroup(
                 new WordKeywordGroup("\\beta", GroupHierarchyType.INDEPENDENT, StandardField.TITLE, "search", true, ',', false));
         assertEquals("β", viewModel.getDisplayName());
     }
 
     @Test
-    public void alwaysMatchedByEmptySearchString() throws Exception {
+    void alwaysMatchedByEmptySearchString() throws Exception {
         assertTrue(viewModel.isMatchedBy(""));
     }
 
     @Test
-    public void isMatchedIfContainsPartOfSearchString() throws Exception {
+    void isMatchedIfContainsPartOfSearchString() throws Exception {
         assertTrue(viewModel.isMatchedBy("est"));
     }
 
     @Test
-    public void treeOfAutomaticKeywordGroupIsCombined() throws Exception {
+    void treeOfAutomaticKeywordGroupIsCombined() throws Exception {
         BibEntry entryOne = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B1, A > C");
         BibEntry entryTwo = new BibEntry().withField(StandardField.KEYWORDS, "A > D, E");
         BibEntry entryThree = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B2");
@@ -94,7 +93,7 @@ public void treeOfAutomaticKeywordGroupIsCombined() throws Exception {
     }
 
     @Test
-    public void draggedOnTopOfGroupAddsBeforeIt() throws Exception {
+    void draggedOnTopOfGroupAddsBeforeIt() throws Exception {
         GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
         WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
         WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
@@ -109,7 +108,7 @@ public void draggedOnTopOfGroupAddsBeforeIt() throws Exception {
     }
 
     @Test
-    public void draggedOnBottomOfGroupAddsAfterIt() throws Exception {
+    void draggedOnBottomOfGroupAddsAfterIt() throws Exception {
         GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
         WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
         WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
@@ -124,7 +123,7 @@ public void draggedOnBottomOfGroupAddsAfterIt() throws Exception {
     }
 
     @Test
-    public void draggedOnBottomOfGroupAddsAfterItWhenSourceGroupWasBefore() throws Exception {
+    void draggedOnBottomOfGroupAddsAfterItWhenSourceGroupWasBefore() throws Exception {
         GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
         WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
         WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
@@ -139,7 +138,7 @@ public void draggedOnBottomOfGroupAddsAfterItWhenSourceGroupWasBefore() throws E
     }
 
     @Test
-    public void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() throws Exception {
+    void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() throws Exception {
         GroupNodeViewModel rootViewModel = getViewModelForGroup(new WordKeywordGroup("root", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true));
         WordKeywordGroup groupA = new WordKeywordGroup("A", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A", true, ',', true);
         WordKeywordGroup groupB = new WordKeywordGroup("B", GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, "A > B", true, ',', true);
@@ -154,7 +153,7 @@ public void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() throws Exc
     }
 
     @Test
-    public void entriesAreAddedCorrectly() {
+    void entriesAreAddedCorrectly() {
         String groupName = "group";
         ExplicitGroup group = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
@@ -164,7 +163,7 @@ public void entriesAreAddedCorrectly() {
         model.addEntriesToGroup(databaseContext.getEntries());
 
         assertEquals(databaseContext.getEntries(), model.getGroupNode().getEntriesInGroup(databaseContext.getEntries()));
-        assertEquals(groupName, entry.getField(InternalField.GROUPS).get());
+        assertEquals(groupName, entry.getField(StandardField.GROUPS).get());
     }
 
     private GroupNodeViewModel getViewModelForGroup(AbstractGroup group) {
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index 40d37af02b4..7eb1c213f4f 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -9,7 +9,6 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.ExplicitGroup;
@@ -23,14 +22,14 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
-public class GroupTreeViewModelTest {
+class GroupTreeViewModelTest {
     StateManager stateManager;
     GroupTreeViewModel groupTree;
     BibDatabaseContext databaseContext;
     private TaskExecutor taskExecutor;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         databaseContext = new BibDatabaseContext();
         stateManager = new StateManager();
         stateManager.activeDatabaseProperty().setValue(Optional.of(databaseContext));
@@ -39,13 +38,13 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void rootGroupIsAllEntriesByDefault() throws Exception {
+    void rootGroupIsAllEntriesByDefault() throws Exception {
         AllEntriesGroup allEntriesGroup = new AllEntriesGroup("All entries");
         assertEquals(new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, allEntriesGroup, new CustomLocalDragboard()), groupTree.rootGroupProperty().getValue());
     }
 
     @Test
-    public void explicitGroupsAreRemovedFromEntriesOnDelete() {
+    void explicitGroupsAreRemovedFromEntriesOnDelete() {
         ExplicitGroup group = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
@@ -54,11 +53,11 @@ public void explicitGroupsAreRemovedFromEntriesOnDelete() {
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
-        assertEquals(Optional.empty(), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.empty(), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    public void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
+    void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
         String groupName = "A";
         WordKeywordGroup group = new WordKeywordGroup(groupName, GroupHierarchyType.INCLUDING, StandardField.KEYWORDS, groupName, true, ',', true);
         BibEntry entry = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
index 584f14d05f1..78eab56427f 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
@@ -32,7 +32,7 @@ void setUp() {
         database.insertEntry(entry);
         pattern = GlobalBibtexKeyPattern.fromPattern("[auth][year]");
         bibtexKeyPattern = new DatabaseBibtexKeyPattern(pattern);
-        preferences = new BibtexKeyPatternPreferences("", "", false, true, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("", "", false, true, true, pattern, ',', false);
     }
 
     @Test
@@ -54,14 +54,14 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
 
     @Test
     void generateDefaultKeyAlwaysLetter() {
-        preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',', false);
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCiteKeyOptional());
     }
 
     @Test
     void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("", "", true, true, true, pattern, ',', false);
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
@@ -74,14 +74,14 @@ void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
 
     @Test
     void generateDefaultKeyStartDuplicatesAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',', false);
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
     void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("", "", false, false, true, pattern, ',', false);
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
@@ -370,7 +370,7 @@ void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
 
     @Test
     void generateKeyRegExReplace() {
-        preferences = new BibtexKeyPatternPreferences("2", "3", false, true, true, pattern, ',');
+        preferences = new BibtexKeyPatternPreferences("2", "3", false, true, true, pattern, ',', false);
         bibtexKeyPattern.setDefaultValue("[auth][year]");
         entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
index ada1b137b35..7eda3871267 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.StandardEntryType;
@@ -41,7 +40,7 @@ public void setUp() throws InterruptedException {
         entryWijedasa.setField(StandardField.JOURNAL, "Global change biology");
         entryWijedasa.setField(StandardField.MONTH, "#mar#");
         entryWijedasa.setField(new UnknownField("nlm-id"), "9888746");
-        entryWijedasa.setField(InternalField.OWNER, "NLM");
+        entryWijedasa.setField(StandardField.OWNER, "NLM");
         entryWijedasa.setField(StandardField.PAGES, "977--982");
         entryWijedasa.setField(StandardField.PMID, "27670948");
         entryWijedasa.setField(new UnknownField("pubmodel"), "Print-Electronic");
@@ -65,7 +64,7 @@ public void setUp() throws InterruptedException {
         entryEndharti.setField(StandardField.JOURNAL, "BMC complementary and alternative medicine");
         entryEndharti.setField(StandardField.KEYWORDS, "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53");
         entryEndharti.setField(new UnknownField("nlm-id"), "101088661");
-        entryEndharti.setField(InternalField.OWNER, "NLM");
+        entryEndharti.setField(StandardField.OWNER, "NLM");
         entryEndharti.setField(StandardField.PAGES, "374");
         entryEndharti.setField(StandardField.MONTH, "#sep#");
         entryEndharti.setField(StandardField.PMID, "27670445");
@@ -92,7 +91,7 @@ public void setUp() throws InterruptedException {
         bibEntryIchikawa.setField(StandardField.KEYWORDS, "Animals; Antibodies, Protozoan, blood; Antigens, Protozoan, immunology; Cattle, parasitology; Cattle Diseases, epidemiology, parasitology; Enzyme-Linked Immunosorbent Assay, veterinary; Geography; Humans; Indonesia, epidemiology; Livestock, immunology, parasitology; Meat, parasitology; Protozoan Proteins, immunology; Seroepidemiologic Studies; Swine, parasitology; Swine Diseases, epidemiology, parasitology; Toxoplasma, immunology; Toxoplasmosis, Animal, epidemiology, immunology, parasitology; Cattle; ELISA; Indonesia; Pig; TgGRA7; Toxoplasma gondii");
         bibEntryIchikawa.setField(StandardField.MONTH, "#dec#");
         bibEntryIchikawa.setField(new UnknownField("nlm-id"), "9708549");
-        bibEntryIchikawa.setField(InternalField.OWNER, "NLM");
+        bibEntryIchikawa.setField(StandardField.OWNER, "NLM");
         bibEntryIchikawa.setField(StandardField.PAGES, "484--486");
         bibEntryIchikawa.setField(new UnknownField("pii"), "S1383-5769(15)00124-5");
         bibEntryIchikawa.setField(StandardField.PMID, "26197440");
@@ -117,7 +116,7 @@ public void setUp() throws InterruptedException {
         bibEntrySari.setField(StandardField.PUBSTATE, "ppublish");
         bibEntrySari.setField(new UnknownField("revised"), "2018-12-02");
         bibEntrySari.setField(new UnknownField("nlm-id"), "0266303");
-        bibEntrySari.setField(InternalField.OWNER, "NLM");
+        bibEntrySari.setField(StandardField.OWNER, "NLM");
         bibEntrySari.setField(StandardField.PAGES, "977--985");
         bibEntrySari.setField(StandardField.PMID, "26867355");
         bibEntrySari.setField(new UnknownField("pubmodel"), "Print");
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index ed083822907..42c024968ae 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -485,8 +485,8 @@ void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
         assertEquals(Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
                 entry.getField(StandardField.BOOKTITLE));
         assertEquals(Optional.of("2005"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("oezbek"), entry.getField(InternalField.OWNER));
-        assertEquals(Optional.of("2006.05.29"), entry.getField(InternalField.TIMESTAMP));
+        assertEquals(Optional.of("oezbek"), entry.getField(StandardField.OWNER));
+        assertEquals(Optional.of("2006.05.29"), entry.getField(StandardField.TIMESTAMP));
         assertEquals(Optional.of("http://james.howison.name/publications.html"), entry.getField(StandardField.URL));
     }
 
@@ -513,8 +513,8 @@ void parseRecognizesFormatedEntry() throws IOException {
         assertEquals(Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
                 entry.getField(StandardField.BOOKTITLE));
         assertEquals(Optional.of("2005"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("oezbek"), entry.getField(InternalField.OWNER));
-        assertEquals(Optional.of("2006.05.29"), entry.getField(InternalField.TIMESTAMP));
+        assertEquals(Optional.of("oezbek"), entry.getField(StandardField.OWNER));
+        assertEquals(Optional.of("2006.05.29"), entry.getField(StandardField.TIMESTAMP));
         assertEquals(Optional.of("http://james.howison.name/publications.html"), entry.getField(StandardField.URL));
     }
 
@@ -617,18 +617,6 @@ void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
         assertEquals(0, parsed.size());
     }
 
-    @Test
-    void parseRecognizesDuplicateBibtexKeys() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{canh05," + "  author = {Crowston, K. and Annabi, H.},\n"
-                        + "  title = {Title A}}\n" + "@inProceedings{canh05," + "  author={Norton Bar}}"));
-
-        List<String> duplicateKeys = result.getDuplicateKeys();
-
-        assertEquals(1, duplicateKeys.size());
-        assertEquals("canh05", duplicateKeys.get(0));
-    }
-
     @Test
     void parseNotWarnsAboutEntryWithoutBibtexKey() throws IOException {
         BibEntry expected = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 6f2a4a62009..7b0c88c41d9 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -441,7 +441,8 @@ private BibtexKeyPatternPreferences createBibtexKeyPatternPreferences() {
                 false,
                 false,
                 keyPattern,
-                ',');
+                ',',
+                false);
     }
 
     private BibDatabaseContext withMode(BibDatabaseContext context, BibDatabaseMode mode) {
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index 5380dd77fbf..a3013361690 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -4,7 +4,6 @@
 import java.io.StringReader;
 
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
@@ -49,13 +48,13 @@ public void setUp() {
         mBTE.setField(new UnknownField("citeulike-linkout-1"), "http://dx.doi.org/10.1145/1554339.1554341");
         mBTE.setField(StandardField.URL, "http://dx.doi.org/10.1145/1554339.1554341");
         mBTE.setField(StandardField.PUBLISHER, "ACM");
-        mBTE.setField(InternalField.TIMESTAMP, "2010.11.11");
+        mBTE.setField(StandardField.TIMESTAMP, "2010.11.11");
         mBTE.setField(StandardField.AUTHOR, "Chaudhuri, Avik");
         mBTE.setField(StandardField.TITLE, "Language-based security on Android");
         mBTE.setField(StandardField.ADDRESS, "New York, NY, USA");
         mBTE.setField(SpecialField.PRIORITY, "2");
         mBTE.setField(StandardField.ISBN, "978-1-60558-645-8");
-        mBTE.setField(InternalField.OWNER, "Arne");
+        mBTE.setField(StandardField.OWNER, "Arne");
         mBTE.setField(StandardField.YEAR, "2009");
         mBTE.setField(new UnknownField("citeulike-linkout-0"), "http://portal.acm.org/citation.cfm?id=1554339.1554341");
         mBTE.setField(StandardField.DOI, "10.1145/1554339.1554341");
diff --git a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
index 4374f76b69c..b2e911e1d3b 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -10,7 +10,6 @@
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Month;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
@@ -47,10 +46,10 @@ private void initBibEntries() {
         olly2018.setField(StandardField.COMMENT, "COMMENT");
         olly2018.setField(StandardField.DOI, "10/3212.3123");
         olly2018.setField(StandardField.FILE, ":article_dublinCore.pdf:PDF");
-        olly2018.setField(InternalField.GROUPS, "NO");
+        olly2018.setField(StandardField.GROUPS, "NO");
         olly2018.setField(StandardField.HOWPUBLISHED, "online");
         olly2018.setField(StandardField.KEYWORDS, "k1, k2");
-        olly2018.setField(InternalField.OWNER, "me");
+        olly2018.setField(StandardField.OWNER, "me");
         olly2018.setField(StandardField.REVIEW, "review");
         olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
 
@@ -60,7 +59,7 @@ private void initBibEntries() {
         toral2006.setField(StandardField.BOOKTITLE, "Proceedings of EACL");
         toral2006.setField(StandardField.PAGES, "56--61");
         toral2006.setField(StandardField.EPRINTTYPE, "asdf");
-        toral2006.setField(InternalField.OWNER, "Ich");
+        toral2006.setField(StandardField.OWNER, "Ich");
         toral2006.setField(StandardField.URL, "www.url.de");
 
         vapnik2000 = new BibEntry(StandardEntryType.Book);
@@ -69,7 +68,7 @@ private void initBibEntries() {
         vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
         vapnik2000.setField(StandardField.AUTHOR, "Vladimir N. Vapnik");
         vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
-        vapnik2000.setField(InternalField.OWNER, "Ich");
+        vapnik2000.setField(StandardField.OWNER, "Ich");
     }
 
     /**
diff --git a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
index cdbe1a59f68..8e6b6013a32 100644
--- a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
@@ -5,7 +5,7 @@
 
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.model.groups.ExplicitGroup;
 import org.jabref.model.groups.GroupHierarchyType;
@@ -16,14 +16,14 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class ConvertLegacyExplicitGroupsTest {
+class ConvertLegacyExplicitGroupsTest {
 
     private PostOpenMigration action;
     private BibEntry entry;
     private ExplicitGroup group;
 
     @BeforeEach
-    public void setUp() throws Exception {
+    void setUp() throws Exception {
         action = new ConvertLegacyExplicitGroups();
 
         entry = new BibEntry();
@@ -33,16 +33,16 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void performActionWritesGroupMembershipInEntry() throws Exception {
+    void performActionWritesGroupMembershipInEntry() throws Exception {
         ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
 
         action.performMigration(parserResult);
 
-        assertEquals(Optional.of("TestGroup"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    public void performActionClearsLegacyKeys() throws Exception {
+    void performActionClearsLegacyKeys() throws Exception {
         ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
 
         action.performMigration(parserResult);
@@ -51,7 +51,7 @@ public void performActionClearsLegacyKeys() throws Exception {
     }
 
     @Test
-    public void performActionWritesGroupMembershipInEntryForComplexGroupTree() throws Exception {
+    void performActionWritesGroupMembershipInEntryForComplexGroupTree() throws Exception {
         GroupTreeNode root = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         root.addSubgroup(new ExplicitGroup("TestGroup2", GroupHierarchyType.INCLUDING, ','));
         root.addSubgroup(group);
@@ -59,7 +59,7 @@ public void performActionWritesGroupMembershipInEntryForComplexGroupTree() throw
 
         action.performMigration(parserResult);
 
-        assertEquals(Optional.of("TestGroup"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
     }
 
     private ParserResult generateParserResult(GroupTreeNode groupRoot) {
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index 92e001e3604..30937e8235e 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -1,7 +1,7 @@
 package org.jabref.model.database;
 
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.List;
 
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -19,18 +19,18 @@ public class BibDatabaseModeDetectionTest {
 
     @Test
     public void detectBiblatex() {
-        Collection<BibEntry> entries = Arrays.asList(new BibEntry(StandardEntryType.MvBook));
+        List<BibEntry> entries = Arrays.asList(new BibEntry(StandardEntryType.MvBook));
 
-        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
     public void detectUndistinguishableAsBibtex() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.TITLE, "My cool paper");
-        Collection<BibEntry> entries = Arrays.asList(entry);
+        List<BibEntry> entries = Arrays.asList(entry);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -39,17 +39,17 @@ public void detectMixedModeAsBiblatex() {
         bibtex.setField(StandardField.JOURNAL, "IEEE Trans. Services Computing");
         BibEntry biblatex = new BibEntry(StandardEntryType.Article);
         biblatex.setField(StandardField.TRANSLATOR, "Stefan Kolb");
-        Collection<BibEntry> entries = Arrays.asList(bibtex, biblatex);
+        List<BibEntry> entries = Arrays.asList(bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
     public void detectUnknownTypeAsBibtex() {
         BibEntry entry = new BibEntry(UNKNOWN_TYPE);
-        Collection<BibEntry> entries = Arrays.asList(entry);
+        List<BibEntry> entries = Arrays.asList(entry);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -57,9 +57,9 @@ public void ignoreUnknownTypesForBibtexDecision() {
         BibEntry custom = new BibEntry(UNKNOWN_TYPE);
         BibEntry bibtex = new BibEntry(StandardEntryType.Article);
         BibEntry biblatex = new BibEntry(StandardEntryType.Article);
-        Collection<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
+        List<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBTEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 
     @Test
@@ -67,8 +67,8 @@ public void ignoreUnknownTypesForBiblatexDecision() {
         BibEntry custom = new BibEntry(UNKNOWN_TYPE);
         BibEntry bibtex = new BibEntry(StandardEntryType.Article);
         BibEntry biblatex = new BibEntry(StandardEntryType.MvBook);
-        Collection<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
+        List<BibEntry> entries = Arrays.asList(custom, bibtex, biblatex);
 
-        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(BibDatabases.createDatabase(entries)));
+        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
     }
 }
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 5f417a8c486..26dbab89bef 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -53,13 +53,13 @@ void containsEntryIdFindsEntry() {
     }
 
     @Test
-    void insertEntryWithSameIdThrowsException() {
+    void insertEntryWithSameIdDoesNotThrowException() {
         BibEntry entry0 = new BibEntry();
         database.insertEntry(entry0);
 
         BibEntry entry1 = new BibEntry();
         entry1.setId(entry0.getId());
-        assertThrows(KeyCollisionException.class, () -> database.insertEntry(entry1));
+        database.insertEntry(entry1);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
index cdee1413af0..e629b7dfc76 100644
--- a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
@@ -3,7 +3,7 @@
 import java.util.Optional;
 
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.StandardField;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -12,7 +12,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class ExplicitGroupTest {
+class ExplicitGroupTest {
 
     private ExplicitGroup group;
     private ExplicitGroup group2;
@@ -20,75 +20,75 @@ public class ExplicitGroupTest {
     private BibEntry entry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
         group2 = new ExplicitGroup("myExplicitGroup2", GroupHierarchyType.INCLUDING, ',');
         entry = new BibEntry();
     }
 
     @Test
-    public void addSingleGroupToEmptyBibEntryChangesGroupsField() {
+    void addSingleGroupToEmptyBibEntryChangesGroupsField() {
         group.add(entry);
-        assertEquals(Optional.of("myExplicitGroup"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    public void addSingleGroupToNonemptyBibEntryAppendsToGroupsField() {
-        entry.setField(InternalField.GROUPS, "some thing");
+    void addSingleGroupToNonemptyBibEntryAppendsToGroupsField() {
+        entry.setField(StandardField.GROUPS, "some thing");
         group.add(entry);
-        assertEquals(Optional.of("some thing, myExplicitGroup"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("some thing, myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    public void addTwoGroupsToBibEntryChangesGroupsField() {
+    void addTwoGroupsToBibEntryChangesGroupsField() {
         group.add(entry);
         group2.add(entry);
-        assertEquals(Optional.of("myExplicitGroup, myExplicitGroup2"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("myExplicitGroup, myExplicitGroup2"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    public void addDuplicateGroupDoesNotChangeGroupsField() throws Exception {
-        entry.setField(InternalField.GROUPS, "myExplicitGroup");
+    void addDuplicateGroupDoesNotChangeGroupsField() throws Exception {
+        entry.setField(StandardField.GROUPS, "myExplicitGroup");
         group.add(entry);
-        assertEquals(Optional.of("myExplicitGroup"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    // For https://github.com/JabRef/jabref/issues/2334
-    public void removeDoesNotChangeFieldIfContainsNameAsPart() throws Exception {
-        entry.setField(InternalField.GROUPS, "myExplicitGroup_alternative");
+        // For https://github.com/JabRef/jabref/issues/2334
+    void removeDoesNotChangeFieldIfContainsNameAsPart() throws Exception {
+        entry.setField(StandardField.GROUPS, "myExplicitGroup_alternative");
         group.remove(entry);
-        assertEquals(Optional.of("myExplicitGroup_alternative"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("myExplicitGroup_alternative"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    // For https://github.com/JabRef/jabref/issues/2334
-    public void removeDoesNotChangeFieldIfContainsNameAsWord() throws Exception {
-        entry.setField(InternalField.GROUPS, "myExplicitGroup alternative");
+        // For https://github.com/JabRef/jabref/issues/2334
+    void removeDoesNotChangeFieldIfContainsNameAsWord() throws Exception {
+        entry.setField(StandardField.GROUPS, "myExplicitGroup alternative");
         group.remove(entry);
 
-        assertEquals(Optional.of("myExplicitGroup alternative"), entry.getField(InternalField.GROUPS));
+        assertEquals(Optional.of("myExplicitGroup alternative"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
-    // For https://github.com/JabRef/jabref/issues/1873
-    public void containsOnlyMatchesCompletePhraseWithWhitespace() throws Exception {
-        entry.setField(InternalField.GROUPS, "myExplicitGroup b");
+        // For https://github.com/JabRef/jabref/issues/1873
+    void containsOnlyMatchesCompletePhraseWithWhitespace() throws Exception {
+        entry.setField(StandardField.GROUPS, "myExplicitGroup b");
         assertFalse(group.contains(entry));
     }
 
     @Test
-    // For https://github.com/JabRef/jabref/issues/1873
-    public void containsOnlyMatchesCompletePhraseWithSlash() throws Exception {
-        entry.setField(InternalField.GROUPS, "myExplicitGroup/b");
+        // For https://github.com/JabRef/jabref/issues/1873
+    void containsOnlyMatchesCompletePhraseWithSlash() throws Exception {
+        entry.setField(StandardField.GROUPS, "myExplicitGroup/b");
 
         assertFalse(group.contains(entry));
     }
 
     @Test
-    // For https://github.com/JabRef/jabref/issues/2394
-    public void containsMatchesPhraseWithBrackets() throws Exception {
-        entry.setField(InternalField.GROUPS, "[aa] Subgroup1");
+        // For https://github.com/JabRef/jabref/issues/2394
+    void containsMatchesPhraseWithBrackets() throws Exception {
+        entry.setField(StandardField.GROUPS, "[aa] Subgroup1");
         ExplicitGroup explicitGroup = new ExplicitGroup("[aa] Subgroup1", GroupHierarchyType.INCLUDING, ',');
 
         assertTrue(explicitGroup.contains(entry));