diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00fa75dbda72..464b3744f293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,8 +56,9 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#803](https://github.com/JabRef/jabref/issues/803): Fixed dynamically group, free-form search
 - Fixed [#743](https://github.com/JabRef/jabref/issues/743): Logger not configured when JAR is started
 - Fixed [#822](https://github.com/JabRef/jabref/issues/822):OSX - Exception when adding the icon to the dock
-
 - Fixed [#685](https://github.com/JabRef/jabref/issues/685): Fixed MySQL exporting for more than one entry
+- Fixed [#815](https://github.com/JabRef/jabref/issues/815): Curly Braces no longer ignored in OpenOffice/LibreOffice citation
+- Fixed [#855](https://github.com/JabRef/jabref/issues/856): Fixed OpenOffice Manual connect - Clicking on browse does now work correctly
 
 ### Removed
 - Fixed [#627](https://github.com/JabRef/jabref/issues/627): The pdf field is removed from the export formats, use the file field
diff --git a/src/main/java/net/sf/jabref/logic/util/strings/StringUtil.java b/src/main/java/net/sf/jabref/logic/util/strings/StringUtil.java
index 0dcf25d348c2..aeb6d3234516 100644
--- a/src/main/java/net/sf/jabref/logic/util/strings/StringUtil.java
+++ b/src/main/java/net/sf/jabref/logic/util/strings/StringUtil.java
@@ -419,12 +419,35 @@ public static String unifyLineBreaksToConfiguredLineBreaks(String s) {
         return LINE_BREAKS.matcher(s).replaceAll(Globals.NEWLINE);
     }
 
+    /**
+     * Checks if the given String has exactly one pair of surrounding curly braces <br>
+     * Strings with escaped characters in curly braces at the beginning and end are respected, too
+     * @param toCheck The string to check
+     * @return True, if the check was succesful. False otherwise.
+     */
     public static boolean isInCurlyBrackets(String toCheck) {
+        int count = 0;
+        int brackets = 0;
         if ((toCheck == null) || toCheck.isEmpty()) {
-            return false; // In case of null or empty string
+            return false;
         } else {
-            return (toCheck.charAt(0) == '{') && (toCheck.charAt(toCheck.length() - 1) == '}');
+            if ((toCheck.charAt(0) == '{') && (toCheck.charAt(toCheck.length() - 1) == '}')) {
+                for (char c : toCheck.toCharArray()) {
+                    if (c == '{') {
+                        if (brackets == 0) {
+                            count++;
+                        }
+                        brackets++;
+                    } else if (c == '}') {
+                        brackets--;
+                    }
+                }
+
+                return count == 1;
+            }
+            return false;
         }
+
     }
 
     public static boolean isInSquareBrackets(String toCheck) {
diff --git a/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java b/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java
index 06e67bccaa26..332592933287 100644
--- a/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java
+++ b/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java
@@ -22,6 +22,7 @@
 import net.sf.jabref.logic.layout.Layout;
 import net.sf.jabref.logic.layout.LayoutFormatter;
 import net.sf.jabref.logic.layout.LayoutHelper;
+import net.sf.jabref.logic.util.strings.StringUtil;
 
 import java.io.*;
 import java.nio.charset.Charset;
@@ -117,7 +118,6 @@ class OOBibStyle implements Comparable<OOBibStyle> {
     private static final String AUTHOR_LAST_SEPARATOR = "AuthorLastSeparator";
     private static final String AUTHOR_SEPARATOR = "AuthorSeparator";
 
-
     private final JournalAbbreviationRepository repository;
     private static final Pattern QUOTED = Pattern.compile("\".*\"");
 
@@ -472,7 +472,6 @@ public String getNumCitationMarker(List<Integer> number, int minGroupingCount, b
         return sb.toString();
     }
 
-
     /**
      * Format the marker for the in-text citation according to this bib style. Uniquefier letters are added as
      * provided by the uniquefiers argument. If successive entries within the citation are uniquefied from each other,
@@ -488,7 +487,7 @@ public String getNumCitationMarker(List<Integer> number, int minGroupingCount, b
      * @return The formatted citation.
      */
     public String getCitationMarker(List<BibEntry> entries, Map<BibEntry, BibDatabase> database, boolean inParenthesis,
-                                    String[] uniquefiers, int[] unlimAuthors) {
+            String[] uniquefiers, int[] unlimAuthors) {
         // Look for groups of uniquefied entries that should be combined in the output.
         // E.g. (Olsen, 2005a, b) should be output instead of (Olsen, 2005a; Olsen, 2005b).
         int piv = -1;
@@ -504,8 +503,7 @@ public String getCitationMarker(List<BibEntry> entries, Map<BibEntry, BibDatabas
                     if (piv == -1) {
                         piv = i;
                         tmpMarker = getAuthorYearParenthesisMarker(Collections.singletonList(entries.get(i)), tmpMap,
-                                authorField,
-                                (String) citProperties.get(YEAR_FIELD), maxAuthors,
+                                authorField, (String) citProperties.get(YEAR_FIELD), maxAuthors,
                                 (String) citProperties.get(AUTHOR_SEPARATOR),
                                 (String) citProperties.get(AUTHOR_LAST_SEPARATOR),
                                 (String) citProperties.get(ET_AL_STRING), (String) citProperties.get(YEAR_SEPARATOR),
@@ -514,14 +512,14 @@ public String getCitationMarker(List<BibEntry> entries, Map<BibEntry, BibDatabas
                     } else {
                         // See if this entry can go into a group with the previous one:
                         String thisMarker = getAuthorYearParenthesisMarker(Collections.singletonList(entries.get(i)),
-                                tmpMap,
-                                authorField, (String) citProperties.get(YEAR_FIELD), maxAuthors,
+                                tmpMap, authorField, (String) citProperties.get(YEAR_FIELD), maxAuthors,
                                 (String) citProperties.get(AUTHOR_SEPARATOR),
                                 (String) citProperties.get(AUTHOR_LAST_SEPARATOR),
                                 (String) citProperties.get(ET_AL_STRING), (String) citProperties.get(YEAR_SEPARATOR),
                                 (String) citProperties.get(BRACKET_BEFORE), (String) citProperties.get(BRACKET_AFTER),
                                 (String) citProperties.get(CITATION_SEPARATOR), null, unlimAuthors);
 
+
                         String author = getCitationMarkerField(entries.get(i), database.get(entries.get(i)),
                                 authorField);
                         AuthorList al = AuthorList.getAuthorList(author);
@@ -560,36 +558,25 @@ public String getCitationMarker(List<BibEntry> entries, Map<BibEntry, BibDatabas
         }
 
         if (inParenthesis) {
-            return getAuthorYearParenthesisMarker(entries, database,
-                    (String) citProperties.get(AUTHOR_FIELD),
-                    (String) citProperties.get(YEAR_FIELD),
-                    (Integer) citProperties.get(MAX_AUTHORS),
-                    (String) citProperties.get(AUTHOR_SEPARATOR),
-                    (String) citProperties.get(AUTHOR_LAST_SEPARATOR),
-                    (String) citProperties.get(ET_AL_STRING),
-                    (String) citProperties.get(YEAR_SEPARATOR),
-                    (String) citProperties.get(BRACKET_BEFORE),
-                    (String) citProperties.get(BRACKET_AFTER),
-                    (String) citProperties.get(CITATION_SEPARATOR),
-                    uniquefiers, unlimAuthors);
+            return getAuthorYearParenthesisMarker(entries, database, (String) citProperties.get(AUTHOR_FIELD),
+                    (String) citProperties.get(YEAR_FIELD), (Integer) citProperties.get(MAX_AUTHORS),
+                    (String) citProperties.get(AUTHOR_SEPARATOR), (String) citProperties.get(AUTHOR_LAST_SEPARATOR),
+                    (String) citProperties.get(ET_AL_STRING), (String) citProperties.get(YEAR_SEPARATOR),
+                    (String) citProperties.get(BRACKET_BEFORE), (String) citProperties.get(BRACKET_AFTER),
+                    (String) citProperties.get(CITATION_SEPARATOR), uniquefiers, unlimAuthors);
         } else {
             String authorLastSeparator = (String) citProperties.get(AUTHOR_LAST_SEPARATOR);
             String alsInText = (String) citProperties.get(AUTHOR_LAST_SEPARATOR_IN_TEXT);
             if (alsInText != null) {
                 authorLastSeparator = alsInText;
             }
-            return getAuthorYearInTextMarker(entries, database,
-                    (String) citProperties.get(AUTHOR_FIELD),
-                    (String) citProperties.get(YEAR_FIELD),
-                    (Integer) citProperties.get(MAX_AUTHORS),
-                    (String) citProperties.get(AUTHOR_SEPARATOR),
-                    authorLastSeparator,
-                    (String) citProperties.get(ET_AL_STRING),
-                    (String) citProperties.get(IN_TEXT_YEAR_SEPARATOR),
-                    (String) citProperties.get(BRACKET_BEFORE),
-                    (String) citProperties.get(BRACKET_AFTER),
-                    (String) citProperties.get(CITATION_SEPARATOR),
- uniquefiers, unlimAuthors);
+
+            return getAuthorYearInTextMarker(entries, database, (String) citProperties.get(AUTHOR_FIELD),
+                    (String) citProperties.get(YEAR_FIELD), (Integer) citProperties.get(MAX_AUTHORS),
+                    (String) citProperties.get(AUTHOR_SEPARATOR), authorLastSeparator,
+                    (String) citProperties.get(ET_AL_STRING), (String) citProperties.get(IN_TEXT_YEAR_SEPARATOR),
+                    (String) citProperties.get(BRACKET_BEFORE), (String) citProperties.get(BRACKET_AFTER),
+                    (String) citProperties.get(CITATION_SEPARATOR), uniquefiers, unlimAuthors);
         }
     }
 
@@ -732,20 +719,30 @@ private String getAuthorYearInTextMarker(List<BibEntry> entries, Map<BibEntry, B
      * @return The resolved field content, or an empty string if the field(s) were empty.
      */
     private String getCitationMarkerField(BibEntry entry, BibDatabase database, String field) {
+        String authorField = (String) citProperties.get(AUTHOR_FIELD);
         String[] fields = field.split("/");
         for (String s : fields) {
             String content = BibDatabase.getResolvedField(s, entry, database);
+
             if ((content != null) && !content.trim().isEmpty()) {
                 if (fieldFormatter != null) {
-                    content = fieldFormatter.format(content);
+
+                    if (field.equals(authorField) && StringUtil.isInCurlyBrackets(content)) {
+                        content = fieldFormatter.format(content);
+                        content = "{" + content + "}";
+                        return content;
+                    }
+                    return fieldFormatter.format(content);
                 }
                 return content;
+
             }
         }
         // No luck? Return an empty string:
         return "";
     }
 
+
     /**
      * Look up the nth author and return the proper last name for citation markers.
      *
diff --git a/src/main/java/net/sf/jabref/openoffice/OOPreFormatter.java b/src/main/java/net/sf/jabref/openoffice/OOPreFormatter.java
index 30eff8987606..1f763d6e235a 100644
--- a/src/main/java/net/sf/jabref/openoffice/OOPreFormatter.java
+++ b/src/main/java/net/sf/jabref/openoffice/OOPreFormatter.java
@@ -39,6 +39,8 @@ public String format(String field) {
                 .replace("\\$", "&dollar;") // Replace \$ with &dollar;
                 .replaceAll("\\$([^\\$]*)\\$", "\\{$1\\}"); // Replace $...$ with {...} to simplify conversion
 
+
+
         StringBuilder sb = new StringBuilder();
         StringBuilder currentCommand = null;
 
@@ -66,7 +68,8 @@ public String format(String field) {
                 incommand = true;
                 currentCommand = new StringBuilder();
             } else if (!incommand && ((c == '{') || (c == '}'))) {
-                // Swallow the brace.
+                //Swallow braces, necessary for replacing encoded characters
+
             } else if (Character.isLetter(c) || (c == '%')
                     || Globals.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
                 escaped = false;
diff --git a/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java b/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java
index 6d4ea0a5d95f..c9631ce53484 100644
--- a/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java
+++ b/src/main/java/net/sf/jabref/openoffice/OpenOfficePanel.java
@@ -12,7 +12,7 @@
     You should have received a copy of the GNU General Public License along
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 package net.sf.jabref.openoffice;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -82,9 +82,9 @@ public class OpenOfficePanel extends AbstractWorker {
     private OOBibBase ooBase;
     private JabRefFrame frame;
     private SidePaneManager manager;
-    private  OOBibStyle style;
-    private  boolean useDefaultAuthoryearStyle;
-    private  boolean useDefaultNumericalStyle;
+    private OOBibStyle style;
+    private boolean useDefaultAuthoryearStyle;
+    private boolean useDefaultNumericalStyle;
     private StyleSelectDialog styleDialog;
     private boolean dialogOkPressed;
     private boolean autoDetected;
@@ -93,6 +93,7 @@ public class OpenOfficePanel extends AbstractWorker {
 
     private static OpenOfficePanel instance;
 
+
     private OpenOfficePanel() {
         Icon connectImage = IconTheme.JabRefIcon.CONNECT_OPEN_OFFICE.getSmallIcon();
 
@@ -108,9 +109,11 @@ private OpenOfficePanel() {
             Globals.prefs.putDefaultValue(JabRefPreferences.OO_PATH, "C:\\Program Files\\OpenOffice.org 4");
             Globals.prefs.putDefaultValue(JabRefPreferences.OO_EXECUTABLE_PATH,
                     "C:\\Program Files\\OpenOffice.org 4\\program\\soffice.exe");
-            Globals.prefs.putDefaultValue(JabRefPreferences.OO_JARS_PATH, "C:\\Program Files\\OpenOffice.org 4\\program\\classes");
+            Globals.prefs.putDefaultValue(JabRefPreferences.OO_JARS_PATH,
+                    "C:\\Program Files\\OpenOffice.org 4\\program\\classes");
         } else if (OS.OS_X) {
-            Globals.prefs.putDefaultValue(JabRefPreferences.OO_EXECUTABLE_PATH, "/Applications/OpenOffice.org.app/Contents/MacOS/soffice.bin");
+            Globals.prefs.putDefaultValue(JabRefPreferences.OO_EXECUTABLE_PATH,
+                    "/Applications/OpenOffice.org.app/Contents/MacOS/soffice.bin");
             Globals.prefs.putDefaultValue(JabRefPreferences.OO_PATH, "/Applications/OpenOffice.org.app");
             Globals.prefs.putDefaultValue(JabRefPreferences.OO_JARS_PATH,
                     "/Applications/OpenOffice.org.app/Contents/Resources/java");
@@ -171,95 +174,56 @@ private void initPanel() {
 
         useDefaultAuthoryearStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_AUTHORYEAR_STYLE);
         useDefaultNumericalStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_NUMERICAL_STYLE);
-        Action al = new AbstractAction() {
 
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                connect(true);
-            }
-        };
-        connect.addActionListener(al);
+        connect.addActionListener(e -> connect(true));
+        manualConnect.addActionListener(e -> connect(false));
 
-        manualConnect.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                connect(false);
-            }
-        });
         selectDocument.setToolTipText(Localization.lang("Select which open Writer document to work on"));
-        selectDocument.addActionListener(new ActionListener() {
+        selectDocument.addActionListener(e -> {
 
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                try {
-                    ooBase.selectDocument();
-                    frame.output(Localization.lang("Connected to document") + ": "
-                            + ooBase.getCurrentDocumentTitle().orElse(""));
-                } catch (UnknownPropertyException | WrappedTargetException | IndexOutOfBoundsException |
-                        NoSuchElementException | NoDocumentException ex) {
-                    JOptionPane.showMessageDialog(frame, ex.getMessage(), Localization.lang("Error"),
-                            JOptionPane.ERROR_MESSAGE);
-                }
+            try {
+                ooBase.selectDocument();
+                frame.output(Localization.lang("Connected to document") + ": "
+                        + ooBase.getCurrentDocumentTitle().orElse(""));
+            } catch (UnknownPropertyException | WrappedTargetException | IndexOutOfBoundsException |
+                    NoSuchElementException | NoDocumentException ex) {
+                JOptionPane.showMessageDialog(frame, ex.getMessage(), Localization.lang("Error"),
+                        JOptionPane.ERROR_MESSAGE);
             }
+
         });
 
-        setStyleFile.addActionListener(new ActionListener() {
+        setStyleFile.addActionListener(e -> {
 
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (styleDialog == null) {
-                    styleDialog = new StyleSelectDialog(frame, styleFile);
-                }
-                styleDialog.setVisible(true);
-                if (styleDialog.isOkPressed()) {
-                    useDefaultAuthoryearStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_AUTHORYEAR_STYLE);
-                    useDefaultNumericalStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_NUMERICAL_STYLE);
-                    styleFile = Globals.prefs.get(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE);
-                    try {
-                        readStyleFile();
-                    } catch (IOException ex) {
-                        LOGGER.warn("Could not read style file", ex);
-                    }
+            if (styleDialog == null) {
+                styleDialog = new StyleSelectDialog(frame, styleFile);
+            }
+            styleDialog.setVisible(true);
+            if (styleDialog.isOkPressed()) {
+                useDefaultAuthoryearStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_AUTHORYEAR_STYLE);
+                useDefaultNumericalStyle = Globals.prefs.getBoolean(JabRefPreferences.OO_USE_DEFAULT_NUMERICAL_STYLE);
+                styleFile = Globals.prefs.get(JabRefPreferences.OO_BIBLIOGRAPHY_STYLE_FILE);
+                try {
+                    readStyleFile();
+                } catch (IOException ex) {
+                    LOGGER.warn("Could not read style file", ex);
                 }
             }
+
         });
 
         pushEntries.setToolTipText(Localization.lang("Cite selected entries between parenthesis"));
-        pushEntries.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                pushEntries(true, true, false);
-            }
-        });
+        pushEntries.addActionListener(e -> pushEntries(true, true, false));
         pushEntriesInt.setToolTipText(Localization.lang("Cite selected entries with in-text citation"));
-        pushEntriesInt.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                pushEntries(false, true, false);
-            }
-        });
-        pushEntriesEmpty.setToolTipText(Localization.lang("Insert a citation without text (the entry will appear in the reference list)"));
-        pushEntriesEmpty.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                pushEntries(false, false, false);
-            }
-        });
+        pushEntriesInt.addActionListener(e -> pushEntries(false, true, false));
+        pushEntriesEmpty.setToolTipText(
+                Localization.lang("Insert a citation without text (the entry will appear in the reference list)"));
+        pushEntriesEmpty.addActionListener(e -> pushEntries(false, false, false));
         pushEntriesAdvanced.setToolTipText(Localization.lang("Cite selected entries with extra information"));
-        pushEntriesAdvanced.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                pushEntries(false, true, true);
-            }
-        });
+        pushEntriesAdvanced.addActionListener(e -> pushEntries(false, true, true));
 
         update.setToolTipText(Localization.lang("Ensure that the bibliography is up-to-date"));
-        Action updateAction = new AbstractAction() {
+        AbstractAction updateAction = new AbstractAction() {
 
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -276,8 +240,11 @@ public void actionPerformed(ActionEvent e) {
                     List<String> unresolvedKeys = ooBase.refreshCiteMarkers(databases, style);
                     ooBase.rebuildBibTextSection(databases, style);
                     if (!unresolvedKeys.isEmpty()) {
-                        JOptionPane.showMessageDialog(frame, Localization.lang("Your OpenOffice document references the BibTeX key '%0', which could not be found in your current database.",
-                                unresolvedKeys.get(0)), Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(frame,
+                                Localization.lang(
+                                        "Your OpenOffice document references the BibTeX key '%0', which could not be found in your current database.",
+                                        unresolvedKeys.get(0)),
+                                Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
                     }
                 } catch (UndefinedCharacterFormatException ex) {
                     reportUndefinedCharacterFormat(ex);
@@ -286,13 +253,18 @@ public void actionPerformed(ActionEvent e) {
                 } catch (ConnectionLostException ex) {
                     showConnectionLostErrorMessage();
                 } catch (IOException ex) {
-                        JOptionPane.showMessageDialog(frame, Localization.lang("You must select either a valid style file, or use one of the default styles."),
-                                Localization.lang("No valid style file defined"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(frame,
+                            Localization
+                                    .lang("You must select either a valid style file, or use one of the default styles."),
+                            Localization.lang("No valid style file defined"), JOptionPane.ERROR_MESSAGE);
                     LOGGER.warn("Problem with style file", ex);
-                        return;
+                    return;
                 } catch (BibEntryNotFoundException ex) {
-                    JOptionPane.showMessageDialog(frame, Localization.lang("Your OpenOffice document references the BibTeX key '%0', which could not be found in your current database.",
-                            ex.getBibtexKey()), Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(frame,
+                            Localization.lang(
+                                    "Your OpenOffice document references the BibTeX key '%0', which could not be found in your current database.",
+                                    ex.getBibtexKey()),
+                            Localization.lang("Unable to synchronize bibliography"), JOptionPane.ERROR_MESSAGE);
                 } catch (Exception e1) {
                     LOGGER.warn("Could not update bibliography", e1);
                 }
@@ -301,40 +273,25 @@ public void actionPerformed(ActionEvent e) {
         update.addActionListener(updateAction);
 
         merge.setToolTipText(Localization.lang("Combine pairs of citations that are separated by spaces only"));
-        merge.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                try {
-                    ooBase.combineCiteMarkers(getBaseList(), style);
-                } catch (UndefinedCharacterFormatException e) {
-                    reportUndefinedCharacterFormat(e);
-                } catch (Exception e) {
-                    LOGGER.warn("Problem combining cite markers", e);
-                }
-
+        merge.addActionListener(e -> {
+            try {
+                ooBase.combineCiteMarkers(getBaseList(), style);
+            } catch (UndefinedCharacterFormatException ex) {
+                reportUndefinedCharacterFormat(ex);
+            } catch (Exception ex) {
+                LOGGER.warn("Problem combining cite markers", ex);
             }
-        });
-
-        settingsB.addActionListener(new ActionListener() {
 
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                showSettingsPopup();
-            }
         });
-
-        manageCitations.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                try {
-                    CitationManager cm = new CitationManager(frame, ooBase);
-                    cm.showDialog();
-                } catch (NoSuchElementException | WrappedTargetException | UnknownPropertyException e) {
-                    LOGGER.warn("Problem showing citation manager", e);
-                }
+        settingsB.addActionListener(e -> showSettingsPopup());
+        manageCitations.addActionListener(e -> {
+            try {
+                CitationManager cm = new CitationManager(frame, ooBase);
+                cm.showDialog();
+            } catch (NoSuchElementException | WrappedTargetException | UnknownPropertyException ex) {
+                LOGGER.warn("Problem showing citation manager", ex);
             }
+
         });
 
         selectDocument.setEnabled(false);
@@ -352,8 +309,8 @@ public void actionPerformed(ActionEvent event) {
                 "p,p,p,p,p,p,p,p,p,p"));
 
         //ButtonBarBuilder bb = new ButtonBarBuilder();
-        DefaultFormBuilder bb = new DefaultFormBuilder(new FormLayout
-                ("fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, "
+        DefaultFormBuilder bb = new DefaultFormBuilder(
+                new FormLayout("fill:pref:grow, 1dlu, fill:pref:grow, 1dlu, fill:pref:grow, "
                         + "1dlu, fill:pref:grow, 1dlu, fill:pref:grow", ""));
         bb.append(connect);
         bb.append(manualConnect);
@@ -403,10 +360,8 @@ private void connect(boolean auto) {
                 dialogOkPressed = true;
                 diag.dispose();
             } else if (!adp.cancelled()) {
-                JOptionPane.showMessageDialog(diag,
-                        Localization.lang("Autodetection failed"),
-                        Localization.lang("Autodetection failed"),
-                        JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(diag, Localization.lang("Autodetection failed"),
+                        Localization.lang("Autodetection failed"), JOptionPane.ERROR_MESSAGE);
             }
             if (!autoDetected) {
                 return;
@@ -484,16 +439,12 @@ private void connect(boolean auto) {
         } catch (IOException e) {
             LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", e);
             JOptionPane.showMessageDialog(frame,
-                    Localization.lang("Could not connect to running OpenOffice.")
-                        + "\n"
-                        + Localization.lang("Make sure you have installed OpenOffice with Java support.")
-                        + "\n"
-                        + Localization.lang("If connecting manually, please verify program and library paths.")
-                        + "\n"
-                        + "\n"
-                        + Localization.lang("Error message:") + " " + e.getMessage());
-            }
+                    Localization.lang("Could not connect to running OpenOffice.") + "\n"
+                            + Localization.lang("Make sure you have installed OpenOffice with Java support.") + "\n"
+                            + Localization.lang("If connecting manually, please verify program and library paths.")
+                            + "\n" + "\n" + Localization.lang("Error message:") + " " + e.getMessage());
         }
+    }
 
     @Override
     public void run() {
@@ -534,7 +485,6 @@ private void readStyleFile() throws IOException {
     private static void addURL(List<URL> jarList) throws IOException {
         URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
         Class<URLClassLoader> sysclass = URLClassLoader.class;
-
         try {
             Method method = sysclass.getDeclaredMethod("addURL", CLASS_PARAMETERS);
             method.setAccessible(true);
@@ -545,6 +495,7 @@ private static void addURL(List<URL> jarList) throws IOException {
                 InvocationTargetException e) {
             LOGGER.error("Could not add URL to system classloader", e);
             throw new IOException("Error, could not add URL to system classloader");
+
         }
     }
 
@@ -555,20 +506,26 @@ private void updateConnectionParams(String ooPath, String ooExec, String ooJars)
     }
 
     private void showConnectDialog() {
+
         dialogOkPressed = false;
         final JDialog cDiag = new JDialog(frame, Localization.lang("Set connection parameters"), true);
         final JTextField ooPath = new JTextField(30);
         JButton browseOOPath = new JButton(Localization.lang("Browse"));
         ooPath.setText(Globals.prefs.get(JabRefPreferences.OO_PATH));
+        browseOOPath.addActionListener(BrowseAction.buildForDir(ooPath));
+
         final JTextField ooExec = new JTextField(30);
         JButton browseOOExec = new JButton(Localization.lang("Browse"));
+        ooExec.setText(Globals.prefs.get(JabRefPreferences.OO_EXECUTABLE_PATH));
         browseOOExec.addActionListener(BrowseAction.buildForFile(ooExec));
+
         final JTextField ooJars = new JTextField(30);
         JButton browseOOJars = new JButton(Localization.lang("Browse"));
         browseOOJars.addActionListener(BrowseAction.buildForDir(ooJars));
-        ooExec.setText(Globals.prefs.get(JabRefPreferences.OO_EXECUTABLE_PATH));
         ooJars.setText(Globals.prefs.get(JabRefPreferences.OO_JARS_PATH));
-        DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("left:pref, 4dlu, fill:pref:grow, 4dlu, fill:pref", ""));
+
+        DefaultFormBuilder builder = new DefaultFormBuilder(
+                new FormLayout("left:pref, 4dlu, fill:pref:grow, 4dlu, fill:pref", ""));
         if (OS.WINDOWS || OS.OS_X) {
             builder.append(Localization.lang("Path to OpenOffice directory"));
             builder.append(ooPath);
@@ -589,34 +546,24 @@ private void showConnectDialog() {
         ButtonBarBuilder bb = new ButtonBarBuilder();
         JButton ok = new JButton(Localization.lang("OK"));
         JButton cancel = new JButton(Localization.lang("Cancel"));
-        ActionListener tfListener = new ActionListener() {
+        ActionListener tfListener = (e -> {
 
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                updateConnectionParams(ooPath.getText(), ooExec.getText(), ooJars.getText());
-                cDiag.dispose();
-            }
-        };
+            updateConnectionParams(ooPath.getText(), ooExec.getText(), ooJars.getText());
+            cDiag.dispose();
+
+        });
 
         ooPath.addActionListener(tfListener);
         ooExec.addActionListener(tfListener);
         ooJars.addActionListener(tfListener);
-        ok.addActionListener(new ActionListener() {
-
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                updateConnectionParams(ooPath.getText(), ooExec.getText(), ooJars.getText());
-                dialogOkPressed = true;
-                cDiag.dispose();
-            }
+        ok.addActionListener(e -> {
+            updateConnectionParams(ooPath.getText(), ooExec.getText(), ooJars.getText());
+            dialogOkPressed = true;
+            cDiag.dispose();
         });
-        cancel.addActionListener(new ActionListener() {
 
-            @Override
-            public void actionPerformed(ActionEvent event) {
-                cDiag.dispose();
-            }
-        });
+        cancel.addActionListener(e -> cDiag.dispose());
+
         bb.addGlue();
         bb.addRelatedGap();
         bb.addButton(ok);
@@ -634,7 +581,8 @@ public void actionPerformed(ActionEvent event) {
 
     private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addPageInfo) {
         if (!ooBase.isConnectedToDocument()) {
-            JOptionPane.showMessageDialog(frame, Localization.lang("Not connected to any Writer document. Please"
+            JOptionPane.showMessageDialog(frame,
+                    Localization.lang("Not connected to any Writer document. Please"
                             + " make sure a document is open, and use the 'Select Writer document' button to connect to it."),
                     Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
             return;
@@ -664,10 +612,12 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
                     if (style == null) {
                         readStyleFile();
                     }
-                    ooBase.insertEntry(entries, database, getBaseList(), style, inParenthesis, withText,
-                            pageInfo, Globals.prefs.getBoolean(JabRefPreferences.SYNC_OO_WHEN_CITING));
+                    ooBase.insertEntry(entries, database, getBaseList(), style, inParenthesis, withText, pageInfo,
+                            Globals.prefs.getBoolean(JabRefPreferences.SYNC_OO_WHEN_CITING));
                 } catch (FileNotFoundException ex) {
-                    JOptionPane.showMessageDialog(frame, Localization.lang("You must select either a valid style file, or use one of the default styles."),
+                    JOptionPane.showMessageDialog(frame,
+                            Localization
+                                    .lang("You must select either a valid style file, or use one of the default styles."),
                             Localization.lang("No valid style file defined"), JOptionPane.ERROR_MESSAGE);
                     LOGGER.warn("Problem with style file", ex);
                 } catch (ConnectionLostException ex) {
@@ -686,40 +636,50 @@ private void pushEntries(boolean inParenthesisIn, boolean withText, boolean addP
     }
 
     private void showConnectionLostErrorMessage() {
-        JOptionPane.showMessageDialog(frame, Localization.lang("Connection to OpenOffice has been lost. "
+        JOptionPane.showMessageDialog(frame,
+                Localization.lang("Connection to OpenOffice has been lost. "
                         + "Please make sure OpenOffice is running, and try to reconnect."),
                 Localization.lang("Connection lost"), JOptionPane.ERROR_MESSAGE);
     }
 
-
     private void reportUndefinedParagraphFormat(UndefinedParagraphFormatException ex) {
-        JOptionPane.showMessageDialog(frame, "<html>" + Localization.lang("Your style file specifies the paragraph format '%0', "
-                        + "which is undefined in your current OpenOffice document.", ex.getFormatName()) + "<br>"
-                + Localization.lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file.")
-                + "</html>",
-                "", JOptionPane.ERROR_MESSAGE);
+        JOptionPane
+                .showMessageDialog(
+                        frame, "<html>"
+                                + Localization.lang(
+                                        "Your style file specifies the paragraph format '%0', "
+                                                + "which is undefined in your current OpenOffice document.",
+                                        ex.getFormatName())
+                                + "<br>"
+                                + Localization
+                                        .lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file.")
+                + "</html>", "", JOptionPane.ERROR_MESSAGE);
     }
 
     private void reportUndefinedCharacterFormat(UndefinedCharacterFormatException ex) {
-        JOptionPane.showMessageDialog(frame, "<html>" + Localization.lang("Your style file specifies the character format '%0', "
-                        + "which is undefined in your current OpenOffice document.", ex.getFormatName()) + "<br>"
-                + Localization.lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
-                + "</html>",
-                "", JOptionPane.ERROR_MESSAGE);
+        JOptionPane
+                .showMessageDialog(
+                        frame, "<html>"
+                                + Localization.lang(
+                                        "Your style file specifies the character format '%0', "
+                                                + "which is undefined in your current OpenOffice document.",
+                                        ex.getFormatName())
+                                + "<br>"
+                                + Localization
+                                        .lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
+                + "</html>", "", JOptionPane.ERROR_MESSAGE);
     }
 
-
     private void showSettingsPopup() {
         JPopupMenu menu = new JPopupMenu();
         final JCheckBoxMenuItem autoSync = new JCheckBoxMenuItem(
                 Localization.lang("Automatically sync bibliography when inserting citations"),
                 Globals.prefs.getBoolean(JabRefPreferences.SYNC_OO_WHEN_CITING));
-        final JRadioButtonMenuItem useActiveBase = new JRadioButtonMenuItem
-                (Localization.lang("Look up BibTeX entries in the active tab only"));
-        final JRadioButtonMenuItem useAllBases = new JRadioButtonMenuItem
-                (Localization.lang("Look up BibTeX entries in all open databases"));
-        final JMenuItem clearConnectionSettings = new JMenuItem
-                (Localization.lang("Clear connection settings"));
+        final JRadioButtonMenuItem useActiveBase = new JRadioButtonMenuItem(
+                Localization.lang("Look up BibTeX entries in the active tab only"));
+        final JRadioButtonMenuItem useAllBases = new JRadioButtonMenuItem(
+                Localization.lang("Look up BibTeX entries in all open databases"));
+        final JMenuItem clearConnectionSettings = new JMenuItem(Localization.lang("Clear connection settings"));
         ButtonGroup bg = new ButtonGroup();
         bg.add(useActiveBase);
         bg.add(useAllBases);
@@ -729,36 +689,22 @@ private void showSettingsPopup() {
             useActiveBase.setSelected(true);
         }
 
-        autoSync.addActionListener(new ActionListener() {
+        autoSync.addActionListener(
+                e -> Globals.prefs.putBoolean(JabRefPreferences.SYNC_OO_WHEN_CITING, autoSync.isSelected()));
 
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                Globals.prefs.putBoolean(JabRefPreferences.SYNC_OO_WHEN_CITING, autoSync.isSelected());
-            }
-        });
-        useAllBases.addActionListener(new ActionListener() {
+        useAllBases.addActionListener(
+                e -> Globals.prefs.putBoolean(JabRefPreferences.USE_ALL_OPEN_BASES, useAllBases.isSelected()));
 
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                Globals.prefs.putBoolean(JabRefPreferences.USE_ALL_OPEN_BASES, useAllBases.isSelected());
-            }
-        });
-        useActiveBase.addActionListener(new ActionListener() {
+        useActiveBase.addActionListener(
+                e -> Globals.prefs.putBoolean(JabRefPreferences.USE_ALL_OPEN_BASES, !useActiveBase.isSelected()));
 
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                Globals.prefs.putBoolean(JabRefPreferences.USE_ALL_OPEN_BASES, !useActiveBase.isSelected());
-            }
-        });
-        clearConnectionSettings.addActionListener(new ActionListener() {
+        clearConnectionSettings.addActionListener(e -> {
+
+            Globals.prefs.clear(JabRefPreferences.OO_PATH);
+            Globals.prefs.clear(JabRefPreferences.OO_EXECUTABLE_PATH);
+            Globals.prefs.clear(JabRefPreferences.OO_JARS_PATH);
+            frame.output(Localization.lang("Cleared connection settings."));
 
-            @Override
-            public void actionPerformed(ActionEvent actionEvent) {
-                Globals.prefs.clear(JabRefPreferences.OO_PATH);
-                Globals.prefs.clear(JabRefPreferences.OO_EXECUTABLE_PATH);
-                Globals.prefs.clear(JabRefPreferences.OO_JARS_PATH);
-                frame.output(Localization.lang("Cleared connection settings."));
-            }
         });
 
         menu.add(autoSync);
@@ -770,14 +716,16 @@ public void actionPerformed(ActionEvent actionEvent) {
         menu.show(settingsB, 0, settingsB.getHeight());
     }
 
-
     public String getName() {
         return "OpenOffice";
     }
 
+
     class OOPanel extends SidePaneComponent {
 
         private final OpenOfficePanel openOfficePanel;
+
+
         public OOPanel(SidePaneManager sidePaneManager, Icon url, String s, OpenOfficePanel panel) {
             super(sidePaneManager, url, s);
             openOfficePanel = panel;
diff --git a/src/test/java/net/sf/jabref/logic/util/strings/StringUtilTest.java b/src/test/java/net/sf/jabref/logic/util/strings/StringUtilTest.java
index 9240064f4df1..f89015511e81 100644
--- a/src/test/java/net/sf/jabref/logic/util/strings/StringUtilTest.java
+++ b/src/test/java/net/sf/jabref/logic/util/strings/StringUtilTest.java
@@ -175,9 +175,13 @@ public void testIsInCurlyBrackets() {
         assertFalse(StringUtil.isInCurlyBrackets(null));
         assertTrue(StringUtil.isInCurlyBrackets("{}"));
         assertTrue(StringUtil.isInCurlyBrackets("{a}"));
+        assertTrue(StringUtil.isInCurlyBrackets("{a{a}}"));
+        assertTrue(StringUtil.isInCurlyBrackets("{{\\AA}sa {\\AA}Stor{\\aa}}"));
         assertFalse(StringUtil.isInCurlyBrackets("{"));
         assertFalse(StringUtil.isInCurlyBrackets("}"));
         assertFalse(StringUtil.isInCurlyBrackets("a{}a"));
+        assertFalse(StringUtil.isInCurlyBrackets("{\\AA}sa {\\AA}Stor{\\aa}"));
+
     }
 
     @Test