diff --git a/src/main/java/com/owncloud/android/datamodel/Template.java b/src/main/java/com/owncloud/android/datamodel/Template.java
index 635167a6b5..dbdd7a6f9d 100644
--- a/src/main/java/com/owncloud/android/datamodel/Template.java
+++ b/src/main/java/com/owncloud/android/datamodel/Template.java
@@ -38,9 +38,9 @@ import lombok.Setter;
 @NoArgsConstructor
 public class Template {
 
-    private int id;
-    private String name;
-    private String thumbnailLink;
-    private String type;
-    private String extension;
+    public int id;
+    public String name;
+    public String thumbnailLink;
+    public String type;
+    public String extension;
 }
diff --git a/src/main/java/com/owncloud/android/ui/events/SearchEvent.java b/src/main/java/com/owncloud/android/ui/events/SearchEvent.java
index 9df2593c97..e028f35d4c 100644
--- a/src/main/java/com/owncloud/android/ui/events/SearchEvent.java
+++ b/src/main/java/com/owncloud/android/ui/events/SearchEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Nextcloud Android client application
  *
  * @author Mario Danic
@@ -23,44 +23,27 @@ import com.owncloud.android.lib.resources.files.SearchRemoteOperation;
 
 import org.parceler.Parcel;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
 /**
  * Search event
  */
 @Parcel
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class SearchEvent {
-    private String searchQuery;
-
-    private SearchRemoteOperation.SearchType searchType;
-
-    private UnsetType unsetType;
+    public String searchQuery;
+    public SearchRemoteOperation.SearchType searchType;
+    public UnsetType unsetType;
 
     public enum UnsetType {
         NO_UNSET,
         UNSET_DRAWER,
         UNSET_BOTTOM_NAV_BAR
     }
-
-    public SearchEvent() {
-
-    }
-
-    public SearchEvent(String searchQuery, SearchRemoteOperation.SearchType searchType, UnsetType unsetType) {
-
-        this.searchQuery = searchQuery;
-        this.searchType = searchType;
-        this.unsetType = unsetType;
-
-    }
-
-    public UnsetType getUnsetType() {
-        return unsetType;
-    }
-
-    public String getSearchQuery() {
-        return searchQuery;
-    }
-
-    public SearchRemoteOperation.SearchType getSearchType() {
-        return searchType;
-    }
 }