diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
index 7b0e56a..2499676 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java
@@ -321,7 +321,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> {
     public static void replaceTags(DataSet dataSet, Map<Tag, Tag> replaceTags) {
         replaceTags.forEach((orig, replace) -> dataSet.allNonDeletedPrimitives().parallelStream()
                 .filter(prim -> prim.hasTag(orig.getKey(), orig.getValue())
-                        || prim.hasKey(orig.getKey()) && Utils.isBlank(orig.getValue()))
+                        || (prim.hasKey(orig.getKey()) && Utils.isBlank(orig.getValue())))
                 .forEach(prim -> prim.put(replace)));
     }
 
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
index 7e32006..0d45974 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfo.java
@@ -40,7 +40,8 @@ public class MapWithAIInfo extends
     private Map<String, String> replacementTags;
     private boolean conflate;
     private String conflationUrl;
-    public static BooleanProperty THIRD_PARTY_CONFLATE = new BooleanProperty("mapwithai.third_party.conflate", true);
+    public static final BooleanProperty THIRD_PARTY_CONFLATE = new BooleanProperty("mapwithai.third_party.conflate",
+            true);
 
     /**
      * The preferred source string for the source. This is added as a source tag on
diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
index 2167a16..16ff898 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReader.java
@@ -197,7 +197,7 @@ public class ESRISourceReader {
             newInfo.setSource(sourceTag.toString());
         }
         newInfo.setTermsOfUseURL("https://wiki.openstreetmap.org/wiki/Esri/ArcGIS_Datasets#License");
-        return (newInfo);
+        return newInfo;
     }
 
     /**