diff --git a/Kitodo-API/src/main/java/org/kitodo/config/KitodoConfig.java b/Kitodo-API/src/main/java/org/kitodo/config/KitodoConfig.java
index cec59ad1286..015d4ead277 100644
--- a/Kitodo-API/src/main/java/org/kitodo/config/KitodoConfig.java
+++ b/Kitodo-API/src/main/java/org/kitodo/config/KitodoConfig.java
@@ -12,7 +12,9 @@
 package org.kitodo.config;
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.nio.file.Paths;
 import java.util.NoSuchElementException;
 import java.util.Optional;
@@ -237,6 +239,27 @@ public static Optional<String> getOptionalString(ParameterInterface key) {
         }
     }
 
+    /**
+     * Returns the URL of the search server.
+     * 
+     * @return the URL
+     * @throws MalformedURLException
+     *             if an unknown protocol, or the port is a negative number
+     *             other than -1
+     */
+    public static URL getSearchServerUrl() throws MalformedURLException {
+        String host = getParameter("elasticsearch.host", "localhost");
+        int port = getIntParameter(new ParameterInterface() {
+            @Override
+            public String getName() {
+                return "elasticsearch.port";
+            }
+        }, 9200);
+        String protocol = getParameter("elasticsearch.protocol", "http");
+        String path = getParameter("elasticsearch.path", "/");
+        return new URL(protocol, host, port, path);
+    }
+
     /**
      * Returns the selected URI from the configuration file. Throws a
      * {@code NoSuchElementException} if no such parameter exists.
diff --git a/Kitodo-DataManagement/hibernate.properties b/Kitodo-DataManagement/hibernate.properties
new file mode 100644
index 00000000000..bbd8d7c534a
--- /dev/null
+++ b/Kitodo-DataManagement/hibernate.properties
@@ -0,0 +1,3 @@
+hibernate.search.enabled=true
+hibernate.search.backend.hosts=localhost:9200
+hibernate.search.backend.protocol=http
diff --git a/Kitodo-DataManagement/pom.xml b/Kitodo-DataManagement/pom.xml
index d9e6a26760b..5bc990a8619 100644
--- a/Kitodo-DataManagement/pom.xml
+++ b/Kitodo-DataManagement/pom.xml
@@ -83,6 +83,16 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-jcache</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opensearch</groupId>
+            <artifactId>opensearch</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opensearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
@@ -121,6 +131,17 @@
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
         </dependency>
+        <!-- Hibernate Search dependencies -->
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-mapper-orm</artifactId>
+            <version>${hibernate-search.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-backend-elasticsearch</artifactId>
+            <version>${hibernate-search.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseBean.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseBean.java
index d6414c28101..ce23b7b021c 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseBean.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseBean.java
@@ -22,6 +22,7 @@
 import javax.persistence.MappedSuperclass;
 
 import org.hibernate.Hibernate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.data.database.persistence.BaseDAO;
 
 /**
@@ -34,6 +35,7 @@ public abstract class BaseBean implements Serializable {
 
     @Id
     @Column(name = "id")
+    @GenericField
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     protected Integer id;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseTemplateBean.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseTemplateBean.java
index 2ed4a6ca721..e136775d1dd 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseTemplateBean.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/BaseTemplateBean.java
@@ -17,18 +17,22 @@
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+
 /**
  * This bean contains properties common for Template and Process.
  */
 @MappedSuperclass
 public abstract class BaseTemplateBean extends BaseBean {
 
+    @GenericField
     @Column(name = "title")
     protected String title;
 
     @Column(name = "creationDate")
     protected Date creationDate;
 
+    @GenericField
     @Column(name = "sortHelperStatus")
     private String sortHelperStatus;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Batch.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Batch.java
index 1577c6b0e39..93fb527049d 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Batch.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Batch.java
@@ -27,6 +27,9 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
 import org.kitodo.data.database.enums.BatchType;
 import org.kitodo.data.database.persistence.BatchDAO;
 
@@ -38,6 +41,7 @@
  * multi-journal binding unit.
  */
 @Entity
+@Indexed(index = "kitodo-batch")
 @Table(name = "batch")
 public class Batch extends BaseBean {
 
@@ -45,6 +49,7 @@ public class Batch extends BaseBean {
      * The batch title. Using titles for batches is optional, the field may be
      * {@code null}. If so, the ID will be shown to the user instead.
      */
+    @GenericField
     @Column(name = "title")
     private String title;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Client.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Client.java
index efdc9cf95df..62b3f0fcecd 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Client.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Client.java
@@ -25,12 +25,14 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.data.database.persistence.ClientDAO;
 
 @Entity
 @Table(name = "client")
 public class Client extends BaseBean {
 
+    @GenericField
     @Column(name = "name")
     private String name;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Comment.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Comment.java
index 4aac5ceef6f..17c03f09dcb 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Comment.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Comment.java
@@ -22,6 +22,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.data.database.enums.CommentType;
 
 @Entity
@@ -31,6 +32,7 @@ public class Comment extends BaseBean {
      * The field message holds the comment message.
      */
     @Column(name = "message", columnDefinition = "longtext")
+    @GenericField
     private String message;
 
     /**
@@ -38,6 +40,7 @@ public class Comment extends BaseBean {
      */
     @Column(name = "type")
     @Enumerated(EnumType.STRING)
+    @GenericField
     private CommentType type;
 
     /**
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Docket.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Docket.java
index 981c4218a54..d8506ecf97f 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Docket.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Docket.java
@@ -20,20 +20,32 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
+
 @Entity
+@Indexed(index = "kitodo-docket")
 @Table(name = "docket")
 public class Docket extends BaseBean {
 
+    @GenericField
     @Column(name = "title")
     private String title;
 
+    @GenericField
     @Column(name = "file")
     private String file;
 
+    @GenericField
     @Column(name = "active")
     private Boolean active = true;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "name"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "client_id", foreignKey = @ForeignKey(name = "FK_docket_client_id"))
     private Client client;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Filter.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Filter.java
index 3fe328e4734..90ea446254f 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Filter.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Filter.java
@@ -21,20 +21,28 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+
 /**
  * Filter bean.
  */
 @Entity
+@Indexed(index = "kitodo-filter")
 @Table(name = "filter")
 public class Filter extends BaseBean {
 
+    @GenericField
     @Column(name = "value", columnDefinition = "longtext")
     private String value;
 
+    @GenericField
     @Column(name = "creationDate")
     private Date creationDate;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id"})
     @JoinColumn(name = "user_id", foreignKey = @ForeignKey(name = "FK_filter_user_id"))
     private User user;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Folder.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Folder.java
index 961fa32ef4a..63f831e8321 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Folder.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Folder.java
@@ -29,6 +29,7 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.api.imagemanagement.ImageManagementInterface;
 import org.kitodo.config.ConfigMain;
 import org.kitodo.data.database.enums.LinkingMode;
@@ -104,6 +105,7 @@ public class Folder extends BaseBean {
      * contents of this folder will be linked.
      */
     @Column(name = "fileGroup")
+    @GenericField
     private String fileGroup;
 
     /**
@@ -130,12 +132,14 @@ public class Folder extends BaseBean {
      * @see org.kitodo.config.xml.fileformats.FileFormatsConfig
      */
     @Column(name = "mimeType")
+    @GenericField
     private String mimeType = "image/jpeg";
 
     /**
      * The path to the folder in the process directory of each processes.
      */
     @Column(name = "path")
+    @GenericField
     private String path = "";
 
     /**
@@ -151,6 +155,7 @@ public class Folder extends BaseBean {
      * replaced before concatenation.
      */
     @Column(name = "urlStructure")
+    @GenericField
     private String urlStructure;
 
     /**
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Process.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Process.java
index fbdc529ef6c..a8c476ffc45 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Process.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Process.java
@@ -38,6 +38,12 @@
 import org.hibernate.LazyInitializationException;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
 import org.kitodo.data.database.converter.ProcessConverter;
 import org.kitodo.data.database.enums.CorrectionComments;
 import org.kitodo.data.database.enums.TaskStatus;
@@ -45,47 +51,62 @@
 import org.kitodo.data.database.persistence.ProcessDAO;
 
 @Entity
+@Indexed(index = "kitodo-process")
 @Table(name = "process")
 public class Process extends BaseTemplateBean {
 
+    @GenericField
     @Column(name = "sortHelperImages")
     private Integer sortHelperImages;
 
+    @GenericField
     @Column(name = "sortHelperArticles")
     private Integer sortHelperArticles;
 
+    @GenericField
     @Column(name = "sortHelperMetadata")
     private Integer sortHelperMetadata;
 
+    @GenericField
     @Column(name = "sortHelperDocstructs")
     private Integer sortHelperDocstructs;
 
+    @FullTextField
     @Column(name = "wikiField", columnDefinition = "longtext")
     private String wikiField = "";
 
+    @GenericField
     @Column(name = "processBaseUri")
     private String processBaseUri;
 
+    @GenericField
     @Column(name = "ordering")
     private Integer ordering;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"title", "id"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "docket_id", foreignKey = @ForeignKey(name = "FK_process_docket_id"))
     private Docket docket;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"title", "active", "id", "client.id"})
     @JoinColumn(name = "project_id", foreignKey = @ForeignKey(name = "FK_process_project_id"))
     private Project project;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"title", "id"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "ruleset_id", foreignKey = @ForeignKey(name = "FK_process_ruleset_id"))
     private Ruleset ruleset;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"title", "id"})
     @JoinColumn(name = "template_id", foreignKey = @ForeignKey(name = "FK_process_template_id"))
     private Template template;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"title", "id"})
     @JoinColumn(name = "parent_id", foreignKey = @ForeignKey(name = "FK_process_parent_id"))
     private Process parent;
 
@@ -95,40 +116,56 @@ public class Process extends BaseTemplateBean {
     @Transient
     private boolean hasChildren = true;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @OneToMany(mappedBy = "process", cascade = CascadeType.ALL, orphanRemoval = true)
+    @IndexedEmbedded(includePaths = {"title", "id"})
     @OrderBy("ordering")
     private List<Task> tasks;
 
     @LazyCollection(LazyCollectionOption.FALSE)
     @OneToMany(mappedBy = "process", cascade = CascadeType.PERSIST, orphanRemoval = true)
+    @IndexedEmbedded(includePaths = {"message"})
     private List<Comment> comments;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(cascade = CascadeType.ALL)
+    @IndexedEmbedded(includePaths = {"id", "title", "value"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinTable(name = "process_x_property", joinColumns = {
         @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "FK_process_x_property_process_id")) }, inverseJoinColumns = {
             @JoinColumn(name = "property_id", foreignKey = @ForeignKey(name = "FK_process_x_property_property_id")) })
     private List<Property> properties;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(cascade = CascadeType.ALL)
+    @IndexedEmbedded(includePaths = {"id", "title", "value"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinTable(name = "template_x_property", joinColumns = {
         @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "FK_template_x_property_process_id")) }, inverseJoinColumns = {
             @JoinColumn(name = "property_id", foreignKey = @ForeignKey(name = "FK_template_x_property_property_id")) })
     private List<Property> templates;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(cascade = CascadeType.ALL)
+    @IndexedEmbedded(includePaths = {"id", "title", "value"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinTable(name = "workpiece_x_property", joinColumns = {
         @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "FK_workpiece_x_property_process_id")) },
             inverseJoinColumns = {
                 @JoinColumn(name = "property_id", foreignKey = @ForeignKey(name = "FK_workpiece_x_property_property_id")) })
     private List<Property> workpieces;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(mappedBy = "processes")
+    @IndexedEmbedded(includePaths = {"title", "id"})
     private List<Batch> batches = new ArrayList<>();
 
     @Column(name = "exported")
+    @GenericField
     private boolean exported;
 
     @Column(name = "inChoiceListShown")
+    @GenericField
     Boolean inChoiceListShown;
 
     @Column(name = "ocrd_workflow_id")
@@ -1010,4 +1047,9 @@ public void setHasComments(boolean hasComments) {
             throw new UnsupportedOperationException("cannot insert comments");
         }
     }
+
+    @Override
+    public String toString() {
+        return title + " [" + id + "]";
+    }
 }
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Project.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Project.java
index da9b33d94e4..ef12b210d93 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Project.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Project.java
@@ -39,65 +39,91 @@
 import org.hibernate.LazyInitializationException;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
 import org.kitodo.data.database.enums.PreviewHoverMode;
 import org.kitodo.data.database.persistence.ProjectDAO;
 
 @Entity
+@Indexed(index = "kitodo-project")
 @Table(name = "project")
 public class Project extends BaseBean implements Comparable<Project> {
 
+    @GenericField
     @Column(name = "title", nullable = false, unique = true)
     private String title;
 
+    @FullTextField
     @Column(name = "dmsImportRootPath")
     private String dmsImportRootPath;
 
+    @FullTextField
     @Column(name = "metsRightsOwner")
     private String metsRightsOwner = "";
 
+    @FullTextField
     @Column(name = "metsRightsOwnerLogo")
     private String metsRightsOwnerLogo = "";
 
+    @FullTextField
     @Column(name = "metsRightsOwnerSite")
     private String metsRightsOwnerSite = "";
 
+    @FullTextField
     @Column(name = "metsRightsOwnerMail")
     private String metsRightsOwnerMail = "";
 
+    @FullTextField
     @Column(name = "metsDigiprovReference")
     private String metsDigiprovReference = "";
 
+    @FullTextField
     @Column(name = "metsDigiprovPresentation")
     private String metsDigiprovPresentation = "";
 
+    @FullTextField
     @Column(name = "metsPointerPath")
     private String metsPointerPath = "";
 
+    @FullTextField
     @Column(name = "metsPurl")
     private String metsPurl = "";
 
+    @FullTextField
     @Column(name = "metsContentId")
     private String metsContentIDs = "";
 
     @Column(name = "startDate")
+    @GenericField
     private Date startDate;
 
     @Column(name = "endDate")
+    @GenericField
     private Date endDate;
 
     @Column(name = "numberOfPages")
+    @GenericField
     private Integer numberOfPages;
 
     @Column(name = "numberOfVolumes")
+    @GenericField
     private Integer numberOfVolumes;
 
     @Column(name = "active")
+    @GenericField
     private Boolean active = true;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(mappedBy = "projects", cascade = CascadeType.PERSIST)
+    @IndexedEmbedded(includePaths = {"surname", "name", "id", "login"})
     private List<User> users;
 
     @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, orphanRemoval = true)
+    @IndexedEmbedded(includePaths = {"id", "title"})
     private List<Process> processes;
 
     @Transient
@@ -105,6 +131,7 @@ public class Project extends BaseBean implements Comparable<Project> {
 
     @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(mappedBy = "projects", cascade = CascadeType.PERSIST)
+    @IndexedEmbedded(includePaths = {"id", "title"})
     private List<Template> templates;
 
     @ManyToOne
@@ -117,10 +144,14 @@ public class Project extends BaseBean implements Comparable<Project> {
             foreignKey = @ForeignKey(name = "FK_project_default_child_process_importconfiguration_id"))
     private ImportConfiguration defaultChildProcessImportConfiguration;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, orphanRemoval = true)
+    @IndexedEmbedded(includePaths = {"path", "urlStructure", "fileGroup", "mimeType"})
     private List<Folder> folders;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "name"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "client_id", foreignKey = @ForeignKey(name = "FK_project_client_id"))
     private Client client;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Property.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Property.java
index 059256b5279..7a1701f71e7 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Property.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Property.java
@@ -23,6 +23,7 @@
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.data.database.converter.PropertyTypeConverter;
 import org.kitodo.data.database.enums.PropertyType;
 import org.kitodo.data.database.persistence.PropertyDAO;
@@ -31,9 +32,11 @@
 @Table(name = "property")
 public class Property extends BaseBean implements Comparable<Property> {
 
+    @GenericField
     @Column(name = "title")
     private String title;
 
+    @GenericField
     @Column(name = "value", columnDefinition = "longtext")
     private String value;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Ruleset.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Ruleset.java
index f8cbd3a8b2c..dcd6e08810b 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Ruleset.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Ruleset.java
@@ -20,23 +20,36 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
+
 @Entity
+@Indexed(index = "kitodo-ruleset")
 @Table(name = "ruleset")
 public class Ruleset extends BaseBean {
 
+    @GenericField
     @Column(name = "title")
     private String title;
 
+    @GenericField
     @Column(name = "file")
     private String file;
 
+    @GenericField
     @Column(name = "orderMetadataByRuleset")
     private Boolean orderMetadataByRuleset = false;
 
+    @GenericField
     @Column(name = "active")
     private Boolean active = true;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "name"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "client_id", foreignKey = @ForeignKey(name = "FK_ruleset_client_id"))
     private Client client;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Task.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Task.java
index 3e0241a117e..7f1c98efbbb 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Task.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Task.java
@@ -30,6 +30,12 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
 import org.kitodo.data.database.converter.TaskEditTypeConverter;
 import org.kitodo.data.database.converter.TaskStatusConverter;
 import org.kitodo.data.database.enums.TaskEditType;
@@ -37,83 +43,109 @@
 import org.kitodo.data.database.persistence.TaskDAO;
 
 @Entity
+@Indexed(index = "kitodo-task")
 @Table(name = "task")
 public class Task extends BaseBean {
 
+    @FullTextField
     @Column(name = "title")
     private String title;
 
+    @GenericField
     @Column(name = "ordering")
     private Integer ordering;
 
+    @GenericField
     @Column(name = "processingStatus")
     @Convert(converter = TaskStatusConverter.class)
     private TaskStatus processingStatus = TaskStatus.LOCKED;
 
+    @GenericField
     @Column(name = "processingTime")
     private Date processingTime;
 
+    @GenericField
     @Column(name = "processingBegin")
     private Date processingBegin;
 
+    @GenericField
     @Column(name = "processingEnd")
     private Date processingEnd;
 
+    @GenericField
     @Column(name = "editType")
     @Convert(converter = TaskEditTypeConverter.class)
     private TaskEditType editType = TaskEditType.UNNOWKN;
 
+    @GenericField
     @Column(name = "homeDirectory")
     private short homeDirectory;
 
+    @GenericField
     @Column(name = "concurrent")
     private boolean concurrent = false;
 
+    @GenericField
     @Column(name = "last")
     private boolean last = false;
 
+    @GenericField
     @Column(name = "correction")
     private boolean correction = false;
 
+    @GenericField
     @Column(name = "typeMetadata")
     private boolean typeMetadata = false;
 
+    @GenericField
     @Column(name = "typeAutomatic")
     private boolean typeAutomatic = false;
 
+    @GenericField
     @Column(name = "typeImagesRead")
     private boolean typeImagesRead = false;
 
+    @GenericField
     @Column(name = "typeImagesWrite")
     private boolean typeImagesWrite = false;
 
+    @GenericField
     @Column(name = "typeGenerateImages")
     private boolean typeGenerateImages = false;
 
+    @GenericField
     @Column(name = "typeValidateImages")
     private boolean typeValidateImages = false;
 
+    @GenericField
     @Column(name = "typeExportDms")
     private boolean typeExportDMS = false;
 
+    @GenericField
     @Column(name = "typeAcceptClose")
     private boolean typeAcceptClose = false;
 
+    @GenericField
     @Column(name = "scriptName")
     private String scriptName;
 
+    @GenericField
     @Column(name = "scriptPath")
     private String scriptPath;
 
+    @GenericField
     @Column(name = "typeCloseVerify")
     private boolean typeCloseVerify = false;
 
+    @GenericField
     @Column(name = "batchStep")
     private boolean batchStep = false;
 
+    @GenericField
     @Column(name = "repeatOnCorrection")
     private boolean repeatOnCorrection = false;
 
+    @GenericField
     @Column(name = "workflowId")
     private String workflowId;
 
@@ -125,14 +157,17 @@ public class Task extends BaseBean {
      * This field contains information about user, which works on this task.
      */
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"surname", "name", "id", "login"})
     @JoinColumn(name = "user_id", foreignKey = @ForeignKey(name = "FK_task_user_id"))
     private User processingUser;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "title", "projects.id", "client.id"})
     @JoinColumn(name = "template_id", foreignKey = @ForeignKey(name = "FK_task_template_id"))
     private Template template;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "title", "project.id", "project.client.id"})
     @JoinColumn(name = "process_id", foreignKey = @ForeignKey(name = "FK_task_process_id"))
     private Process process;
 
@@ -140,7 +175,9 @@ public class Task extends BaseBean {
      * This field contains information about user's roles, which are allowed to
      * work on this task.
      */
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(cascade = CascadeType.PERSIST)
+    @IndexedEmbedded(includePaths = {"id"})
     @JoinTable(name = "task_x_role", joinColumns = {
         @JoinColumn(name = "task_id", foreignKey = @ForeignKey(name = "FK_task_x_role_task_id")) }, inverseJoinColumns = {
             @JoinColumn(name = "role_id", foreignKey = @ForeignKey(name = "FK_task_x_user_role_id")) })
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Template.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Template.java
index 52bec7624b9..3572f046ebe 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Template.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Template.java
@@ -30,28 +30,43 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
 import org.kitodo.data.database.persistence.TemplateDAO;
 
 @Entity
+@Indexed(index = "kitodo-template")
 @Table(name = "template")
 public class Template extends BaseTemplateBean {
 
+    @GenericField
     @Column(name = "active")
     private Boolean active = true;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "name"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "client_id", foreignKey = @ForeignKey(name = "FK_template_client_id"))
     private Client client;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "title"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "docket_id", foreignKey = @ForeignKey(name = "FK_template_docket_id"))
     private Docket docket;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "title"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "ruleset_id", foreignKey = @ForeignKey(name = "FK_template_ruleset_id"))
     private Ruleset ruleset;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "title"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "workflow_id", foreignKey = @ForeignKey(name = "FK_template_workflow_id"))
     private Workflow workflow;
 
@@ -60,9 +75,12 @@ public class Template extends BaseTemplateBean {
 
     @LazyCollection(LazyCollectionOption.FALSE)
     @OneToMany(mappedBy = "template", cascade = CascadeType.ALL, orphanRemoval = true)
+    @IndexedEmbedded(includePaths = {"id", "title"})
     private List<Task> tasks;
 
+    @LazyCollection(LazyCollectionOption.FALSE)
     @ManyToMany(cascade = CascadeType.PERSIST)
+    @IndexedEmbedded(includePaths = {"id", "active", "title"})
     @JoinTable(name = "project_x_template", joinColumns = {
         @JoinColumn(name = "template_id", foreignKey = @ForeignKey(name = "FK_project_x_template_template_id")) },
             inverseJoinColumns = {
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/User.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/User.java
index 5b513d48953..93f7caf35ce 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/User.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/User.java
@@ -26,6 +26,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.kitodo.data.database.persistence.UserDAO;
 
 @Entity
@@ -33,12 +34,15 @@
 public class User extends BaseBean {
 
     @Column(name = "name")
+    @GenericField
     private String name;
 
     @Column(name = "surname")
+    @GenericField
     private String surname;
 
     @Column(name = "login", unique = true)
+    @GenericField
     private String login;
 
     @Column(name = "ldapLogin")
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Workflow.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Workflow.java
index 40f286efc40..325a1090299 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Workflow.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/beans/Workflow.java
@@ -26,24 +26,35 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
 import org.kitodo.data.database.enums.WorkflowStatus;
 import org.kitodo.data.database.persistence.WorkflowDAO;
 
 @Entity
+@Indexed(index = "kitodo-workflow")
 @Table(name = "workflow")
 public class Workflow extends BaseBean {
 
+    @GenericField
     @Column(name = "title")
     private String title;
 
+    @GenericField
     @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private WorkflowStatus status = WorkflowStatus.DRAFT;
 
     @ManyToOne
+    @IndexedEmbedded(includePaths = {"id", "name"})
+    @IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
     @JoinColumn(name = "client_id", foreignKey = @ForeignKey(name = "FK_workflow_client_id"))
     private Client client;
 
+    @GenericField
     @Column(name = "separateStructure")
     private boolean separateStructure = false;
 
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/BaseDAO.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/BaseDAO.java
index f5434c36edc..2f75bc4a570 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/BaseDAO.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/BaseDAO.java
@@ -14,6 +14,7 @@
 import edu.umd.cs.findbugs.annotations.CheckReturnValue;
 
 import java.io.Serializable;
+import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -25,6 +26,8 @@
 
 import javax.persistence.PersistenceException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -38,7 +41,8 @@
  * Base class for DAOs.
  */
 public abstract class BaseDAO<T extends BaseBean> implements Serializable {
-
+    private static final Logger logger = LogManager.getLogger(BaseDAO.class);
+    private static final Pattern PARAMETER_PATTERN = Pattern.compile(":(\\w+)");
     private static final Object lockObject = new Object();
 
     /**
@@ -178,6 +182,7 @@ public T merge(T baseBean) {
     @SuppressWarnings("unchecked")
     public List<T> getByQuery(String query, Map<String, Object> parameters, int first, int max) {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, parameters, first, max);
             Query<T> q = session.createQuery(query);
             q.setFirstResult(first);
             q.setMaxResults(max);
@@ -200,6 +205,7 @@ public List<T> getByQuery(String query, Map<String, Object> parameters, int firs
     @SuppressWarnings("unchecked")
     public List<T> getByQuery(String query, Map<String, Object> parameters) {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, parameters);
             Query<T> q = session.createQuery(query);
             addParameters(q, parameters);
             return q.list();
@@ -216,6 +222,7 @@ public List<T> getByQuery(String query, Map<String, Object> parameters) {
     @SuppressWarnings("unchecked")
     public List<T> getByQuery(String query) {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, Collections.emptyMap());
             List<T> baseBeanObjects = session.createQuery(query).list();
             if (Objects.isNull(baseBeanObjects)) {
                 baseBeanObjects = new ArrayList<>();
@@ -236,6 +243,7 @@ public List<T> getByQuery(String query) {
     @SuppressWarnings("unchecked")
     public List<String> getStringsByQuery(String query, Map<String, Object> parameters) {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, parameters);
             Query<String> queryObject = session.createQuery(query);
             addParameters(queryObject, parameters);
             return queryObject.list();
@@ -253,6 +261,7 @@ public List<String> getStringsByQuery(String query, Map<String, Object> paramete
      */
     public Long count(String query, Map<String, Object> parameters) throws DAOException {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, parameters);
             Query<?> q = session.createQuery(query);
             addParameters(q, parameters);
             return (Long) q.uniqueResult();
@@ -270,6 +279,7 @@ public Long count(String query, Map<String, Object> parameters) throws DAOExcept
      */
     public Long count(String query) throws DAOException {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, Collections.emptyMap());
             return (Long) session.createQuery(query).uniqueResult();
         } catch (PersistenceException e) {
             throw new DAOException(e);
@@ -348,6 +358,7 @@ T retrieveObject(Class<T> cls, Integer id) throws DAOException {
     @SuppressWarnings("unchecked")
     List<T> retrieveObjects(String query, int first, int max) throws DAOException {
         try (Session session = HibernateUtil.getSession()) {
+            debugLogQuery(query, Collections.emptyMap(), first, max);
             Query<T> sessionQuery = session.createQuery(query);
             sessionQuery.setFirstResult(first);
             sessionQuery.setMaxResults(max);
@@ -367,8 +378,9 @@ List<T> retrieveObjects(String query, int first, int max) throws DAOException {
     @SuppressWarnings("unchecked")
     List<T> retrieveAllObjects(Class<T> cls) throws DAOException {
         try (Session session = HibernateUtil.getSession()) {
-            Query<T> query = session.createQuery(String.format("FROM %s ORDER BY id ASC", cls.getSimpleName()));
-            return query.list();
+            String query = String.format("FROM %s ORDER BY id ASC", cls.getSimpleName());
+            debugLogQuery(query, Collections.emptyMap());
+            return session.createQuery(query).list();
         } catch (PersistenceException e) {
             throw new DAOException(e);
         }
@@ -505,4 +517,58 @@ private static List<String> getDatesFromConfig() {
                 .filter(Pattern.compile("\\d{4}|\\d{4}-\\d{2}|\\d{4}-\\d{2}-\\d{2}").asMatchPredicate())
                 .collect(Collectors.toList());
     }
+
+    /**
+     * Enters a search query into the log when it is running in debug level.
+     * Placeholders are replaced with their parameter values.
+     * 
+     * @param query
+     *            search query
+     * @param parameters
+     *            parameter values
+     */
+    private static void debugLogQuery(String query, Map<String, Object> parameters) {
+        debugLogQuery(query, parameters, Integer.MIN_VALUE, Integer.MIN_VALUE);
+    }
+
+    /**
+     * Enters a search query into the log when it is running in debug level.
+     * Placeholders are replaced with their parameter values.
+     * 
+     * @param query
+     *            search query
+     * @param parameters
+     *            parameter values
+     * @param initPointer
+     *            can initialize the object pointer to a later object (sets
+     *            {@linkplain Query#setFirstResult(int)})
+     * @param stopCount
+     *            the search stops after count hits (sets
+     *            {@linkplain Query#setMaxResults(int)})
+     */
+    private static void debugLogQuery(String query, Map<String, Object> parameters, int initPointer, int stopCount) {
+        if (logger.isDebugEnabled()) {
+            String resolved = PARAMETER_PATTERN.matcher(query).replaceAll(matchResult -> {
+                Object parameter = parameters.get(matchResult.group(1));
+                if (Objects.isNull(parameter)) {
+                    return matchResult.group();
+                }
+                if (parameter instanceof String) {
+                    return '\'' + ((String) parameter) + '\'';
+                }
+                if (parameter instanceof AbstractCollection) {
+                    return Objects.toString(parameter).replaceFirst("^\\[(.*)\\]$", "$1");
+                }
+                return Objects.toString(parameter);
+            });
+            if (initPointer != Integer.MIN_VALUE || stopCount != Integer.MIN_VALUE) {
+                if (stopCount != Integer.MIN_VALUE) {
+                    resolved = String.format("%s (limit=%d)", resolved, stopCount);
+                } else {
+                    resolved = String.format("%s (limit=%d, offset=%d)", resolved, stopCount, initPointer);
+                }
+            }
+            logger.debug(resolved);
+        }
+    }
 }
diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/TaskDAO.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/TaskDAO.java
index 7281ccab11d..d1c74fd7eaf 100644
--- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/TaskDAO.java
+++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/database/persistence/TaskDAO.java
@@ -101,7 +101,7 @@ public List<Task> getAllTasksInBetween(Integer orderingMax, Integer orderingMin,
         parameters.put("orderingMax", orderingMax);
         parameters.put("orderingMin", orderingMin);
         parameters.put(KEY_PROCESS_ID, processId);
-        return getByQuery("FROM Task WHERE process_id = :processId AND ordering < :orderingMin"
+        return getByQuery("FROM Task WHERE process.id = :processId AND ordering < :orderingMin"
                 + " AND ordering > :orderingMax ORDER BY ordering ASC",
             parameters);
     }
@@ -119,7 +119,7 @@ public List<Task> getNextTasksForProblemSolution(Integer ordering, Integer proce
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("ordering", ordering);
         parameters.put(KEY_PROCESS_ID, processId);
-        return getByQuery("FROM Task WHERE process_id = :processId AND ordering > :ordering AND repeatOnCorrection = 1",
+        return getByQuery("FROM Task WHERE process.id = :processId AND ordering > :ordering AND repeatOnCorrection = 1",
             parameters);
     }
 
@@ -137,7 +137,7 @@ public List<Task> getPreviousTasksForProblemReporting(Integer ordering, Integer
         parameters.put("ordering", ordering);
         parameters.put(KEY_PROCESS_ID, processId);
         return getByQuery(
-            "FROM Task WHERE process_id = :processId AND ordering < :ordering" + " ORDER BY ordering DESC", parameters);
+            "FROM Task WHERE process.id = :processId AND ordering < :ordering" + " ORDER BY ordering DESC", parameters);
     }
 
     /**
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/ExtendedNode.java b/Kitodo-DataManagement/src/test/java/org/kitodo/ExtendedNode.java
new file mode 100644
index 00000000000..8b4cfa28a90
--- /dev/null
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/ExtendedNode.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+package org.kitodo;
+
+import java.util.Collection;
+import org.opensearch.env.Environment;
+import org.opensearch.node.Node;
+import org.opensearch.plugins.Plugin;
+
+public class ExtendedNode extends Node {
+    ExtendedNode(Environment initialEnvironment, Collection<Class<? extends Plugin>> classpathPlugins) {
+        super(initialEnvironment, classpathPlugins, true);
+    }
+}
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/MockIndex.java b/Kitodo-DataManagement/src/test/java/org/kitodo/MockIndex.java
new file mode 100644
index 00000000000..2d8d5de5bc2
--- /dev/null
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/MockIndex.java
@@ -0,0 +1,63 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+package org.kitodo;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collections;
+import org.apache.commons.io.FileUtils;
+import org.kitodo.config.ConfigMain;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.env.Environment;
+import org.opensearch.node.Node;
+import org.opensearch.transport.Netty4Plugin;
+
+public class MockIndex {
+
+    private static Node node;
+    private static final String HTTP_TRANSPORT_PORT = "9305";
+    private static final String TARGET = "target";
+
+    public static void startNode() throws Exception {
+        final String nodeName = "index";
+        final String port = ConfigMain.getParameter("elasticsearch.port", "9205");
+        Environment environment = prepareEnvironment(port, nodeName, Paths.get("target", "classes"));
+        removeOldDataDirectories("target/" + nodeName);
+        node = new ExtendedNode(environment, Collections.singleton(Netty4Plugin.class));
+        node.start();
+    }
+
+    public static void stopNode() throws Exception {
+        node.close();
+        node = null;
+    }
+
+    private static void removeOldDataDirectories(String dataDirectory) throws Exception {
+        File dataDir = new File(dataDirectory);
+        if (dataDir.exists()) {
+            FileUtils.deleteDirectory(dataDir);
+        }
+    }
+
+    private static Environment prepareEnvironment(String httpPort, String nodeName, Path configPath) {
+        Settings settings = Settings.builder().put("node.name", nodeName)
+                .put("path.data", TARGET)
+                .put("path.logs", TARGET)
+                .put("path.home", TARGET)
+                .put("http.type", "netty4")
+                .put("http.port", httpPort)
+                .put("transport.tcp.port", HTTP_TRANSPORT_PORT)
+                .put("transport.type", "netty4")
+                .put("action.auto_create_index", "false").build();
+        return new Environment(settings, configPath);
+    }
+}
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/AuthorityDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/AuthorityDaoIT.java
index 380228e2abf..6c6ad002167 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/AuthorityDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/AuthorityDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Authority;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class AuthorityDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/ClientDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/ClientDaoIT.java
index 68b74e9c523..fb7053a1d59 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/ClientDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/ClientDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Client;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class ClientDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DataEditorSettingDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DataEditorSettingDaoIT.java
index f625ccfeec4..cc363098304 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DataEditorSettingDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DataEditorSettingDaoIT.java
@@ -16,15 +16,28 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.DataEditorSetting;
 import org.kitodo.data.database.exceptions.DAOException;
 
 
 public class DataEditorSettingDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DocketDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DocketDaoIT.java
index 3117864ef01..abab34c83d0 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DocketDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/DocketDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Docket;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class DocketDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/FilterDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/FilterDaoIT.java
index 5f1e7ce0a75..b6ed1fb5764 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/FilterDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/FilterDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Filter;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class FilterDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapGroupDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapGroupDaoIT.java
index 8d2a29d88a0..cb7ff8368dc 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapGroupDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapGroupDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.LdapGroup;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class LdapGroupDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapServerDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapServerDaoIT.java
index dd643ea26d0..a3fb4cf2ddb 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapServerDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/LdapServerDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.LdapServer;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class LdapServerDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/PropertyDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/PropertyDaoIT.java
index f13a34b1f2f..f97a24bc6a0 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/PropertyDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/PropertyDaoIT.java
@@ -16,15 +16,28 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Property;
 import org.kitodo.data.database.enums.PropertyType;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class PropertyDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RoleDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RoleDaoIT.java
index da22aec849a..10f6751d4b2 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RoleDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RoleDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Role;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class RoleDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RulesetDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RulesetDaoIT.java
index 23d47a1a277..a037dd38664 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RulesetDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/RulesetDaoIT.java
@@ -16,14 +16,27 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.Ruleset;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class RulesetDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
diff --git a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/UserDaoIT.java b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/UserDaoIT.java
index 810a568dd7e..9c5a375490d 100644
--- a/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/UserDaoIT.java
+++ b/Kitodo-DataManagement/src/test/java/org/kitodo/data/database/persistence/UserDaoIT.java
@@ -17,12 +17,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.kitodo.MockIndex;
 import org.kitodo.data.database.beans.User;
 import org.kitodo.data.database.exceptions.DAOException;
 
 public class UserDaoIT {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockIndex.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockIndex.stopNode();
+    }
+
     @Test
     public void runPersistenceSuitTest() throws DAOException {
         List<User> users = getAuthorities();
diff --git a/Kitodo-DataManagement/src/test/resources/hibernate.properties b/Kitodo-DataManagement/src/test/resources/hibernate.properties
new file mode 100644
index 00000000000..df790634709
--- /dev/null
+++ b/Kitodo-DataManagement/src/test/resources/hibernate.properties
@@ -0,0 +1,3 @@
+hibernate.search.enabled=true
+hibernate.search.backend.hosts=localhost:9205
+hibernate.search.backend.protocol=http
diff --git a/Kitodo-DataManagement/src/test/resources/log4j2.xml b/Kitodo-DataManagement/src/test/resources/log4j2.xml
index 676f91f13fe..bcf7cf76fc2 100644
--- a/Kitodo-DataManagement/src/test/resources/log4j2.xml
+++ b/Kitodo-DataManagement/src/test/resources/log4j2.xml
@@ -18,6 +18,12 @@
         </Console>
     </Appenders>
     <Loggers>
+        <Logger name="org.kitodo" level="debug" additivity="false">
+            <AppenderRef ref="STDOUT"/>
+        </Logger>
+        <Logger name="org.opensearch.node" level="info" additivity="false">
+            <AppenderRef ref="STDOUT"/>
+        </Logger>
         <Root level="warning">
             <AppenderRef ref="STDOUT"/>
         </Root>
diff --git a/Kitodo/pom.xml b/Kitodo/pom.xml
index 8000b4e8ecc..c301113d07a 100644
--- a/Kitodo/pom.xml
+++ b/Kitodo/pom.xml
@@ -230,6 +230,16 @@
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opensearch</groupId>
+            <artifactId>opensearch</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opensearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-core</artifactId>
diff --git a/Kitodo/src/main/java/org/kitodo/production/enums/ObjectType.java b/Kitodo/src/main/java/org/kitodo/production/enums/ObjectType.java
index 8e7485f925c..9e34d0a812a 100644
--- a/Kitodo/src/main/java/org/kitodo/production/enums/ObjectType.java
+++ b/Kitodo/src/main/java/org/kitodo/production/enums/ObjectType.java
@@ -14,49 +14,81 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.kitodo.data.database.beans.Authority;
+import org.kitodo.data.database.beans.BaseBean;
+import org.kitodo.data.database.beans.Batch;
+import org.kitodo.data.database.beans.Client;
+import org.kitodo.data.database.beans.Comment;
+import org.kitodo.data.database.beans.DataEditorSetting;
+import org.kitodo.data.database.beans.Docket;
+import org.kitodo.data.database.beans.Filter;
+import org.kitodo.data.database.beans.Folder;
+import org.kitodo.data.database.beans.ImportConfiguration;
+import org.kitodo.data.database.beans.LdapGroup;
+import org.kitodo.data.database.beans.LdapServer;
+import org.kitodo.data.database.beans.MappingFile;
+import org.kitodo.data.database.beans.Process;
+import org.kitodo.data.database.beans.Project;
+import org.kitodo.data.database.beans.Property;
+import org.kitodo.data.database.beans.Role;
+import org.kitodo.data.database.beans.Ruleset;
+import org.kitodo.data.database.beans.Task;
+import org.kitodo.data.database.beans.Template;
+import org.kitodo.data.database.beans.User;
+import org.kitodo.data.database.beans.Workflow;
 import org.kitodo.production.helper.Helper;
 
 public enum ObjectType {
-    AUTHORITY("authority", "authorities", false),
-    CLIENT("client", "clients", false),
-    BATCH("batch", "batches", true),
-    DATAEDITORSETTING("dataEditorSetting", "dataEditorSettings", false),
-    DOCKET("docket", "dockets", true),
-    FOLDER("folder", "folders", false),
-    LDAP_GROUP("ldapGroup", "ldapGroups", false),
-    LDAP_SERVER("ldapServer", "ldapServers", false),
-    PROCESS("process", "processes", true),
-    PROJECT("project", "projects", true),
-    PROPERTY("property", "properties", false),
-    RULESET("ruleset", "rulesets", true),
-    TASK("task", "tasks", true),
-    TEMPLATE("template", "template", true),
-    USER("user", "users", false),
-    ROLE("role", "roles", false),
-    WORKFLOW("workflow", "workflows", true),
-    FILTER("filter", "filters", true),
-    IMPORT_CONFIGURATION("importConfig.configuration", "importConfig.configurations", false),
-    MAPPING_FILE("mappingFile.file", "mappingFile.files", false),
-    COMMENT("comment", "comments", false),
-    NONE("", "", false);
+    AUTHORITY("authority", "authorities", false, Authority.class),
+    CLIENT("client", "clients", false, Client.class),
+    BATCH("batch", "batches", true, Batch.class),
+    DATAEDITORSETTING("dataEditorSetting", "dataEditorSettings", false, DataEditorSetting.class),
+    DOCKET("docket", "dockets", true, Docket.class),
+    FOLDER("folder", "folders", false, Folder.class),
+    LDAP_GROUP("ldapGroup", "ldapGroups", false, LdapGroup.class),
+    LDAP_SERVER("ldapServer", "ldapServers", false, LdapServer.class),
+    PROCESS("process", "processes", true, Process.class),
+    PROJECT("project", "projects", true, Project.class),
+    PROPERTY("property", "properties", false, Property.class),
+    RULESET("ruleset", "rulesets", true, Ruleset.class),
+    TASK("task", "tasks", true, Task.class),
+    TEMPLATE("template", "template", true, Template.class),
+    USER("user", "users", false, User.class),
+    ROLE("role", "roles", false, Role.class),
+    WORKFLOW("workflow", "workflows", true, Workflow.class),
+    FILTER("filter", "filters", true, Filter.class),
+    IMPORT_CONFIGURATION("importConfig.configuration", "importConfig.configurations", false, ImportConfiguration.class),
+    MAPPING_FILE("mappingFile.file", "mappingFile.files", false, MappingFile.class),
+    COMMENT("comment", "comments", false, Comment.class),
+    NONE("", "", false, BaseBean.class);
 
     private final String messageKeySingular;
 
     private final String messageKeyPlural;
 
+    private final Class<? extends BaseBean> beanClass;
+
     private final boolean indexable;
 
     /**
-     * Constructor setting the message key of the object type, used to retrieve it's
-     * translation from the messages resource bundle.
+     * Constructor setting the message key of the object type, used to retrieve
+     * it's translation from the messages resource bundle.
      *
      * @param messageKeySingular
      *            used for translating the object types name
+     * @param messageKeyPlural
+     *            used for translating the object types name
+     * @param indexable
+     *            if the object is indexable
+     * @param beanClass
+     *            bean class to index
      */
-    ObjectType(String messageKeySingular, String messageKeyPlural, boolean indexable) {
+    ObjectType(String messageKeySingular, String messageKeyPlural, boolean indexable,
+            Class<? extends BaseBean> beanClass) {
         this.messageKeySingular = messageKeySingular;
         this.messageKeyPlural = messageKeyPlural;
         this.indexable = indexable;
+        this.beanClass = beanClass;
     }
 
     /**
@@ -86,6 +118,15 @@ public boolean isIndexable() {
         return indexable;
     }
 
+    /**
+     * Returns the bean class indicated by the constant.
+     *
+     * @return the bean class
+     */
+    public Class<? extends BaseBean> getBeanClass() {
+        return beanClass;
+    }
+
     /**
      * Get list of indexable object types.
      *
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java
index b91500da5e6..e730d4de40c 100644
--- a/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java
+++ b/Kitodo/src/main/java/org/kitodo/production/forms/BaseForm.java
@@ -256,6 +256,9 @@ public void setEditActiveTabIndex(int editActiveTabIndex) {
      */
     public void onTabChange(TabChangeEvent event) {
         setActiveTabIndex(event.getComponent().getChildren().indexOf(event.getTab()));
+        if (Objects.equals(event.getTab().getId(), "indexingTab")) {
+            IndexingForm.setNumberOfDatabaseObjects();
+        }
     }
 
     /**
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/IndexingForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/IndexingForm.java
index 082071e8073..57a360e3a2f 100644
--- a/Kitodo/src/main/java/org/kitodo/production/forms/IndexingForm.java
+++ b/Kitodo/src/main/java/org/kitodo/production/forms/IndexingForm.java
@@ -12,9 +12,10 @@
 package org.kitodo.production.forms;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
+import java.util.EnumMap;
 import java.util.List;
-import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.faces.push.Push;
@@ -25,22 +26,82 @@
 import javax.json.JsonArray;
 import javax.json.JsonArrayBuilder;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.kitodo.data.database.exceptions.DAOException;
 import org.kitodo.production.enums.IndexStates;
 import org.kitodo.production.enums.ObjectType;
+import org.kitodo.production.services.ServiceManager;
+import org.kitodo.production.services.index.IndexingService;
 import org.omnifaces.util.Ajax;
 
 @Named
 @ApplicationScoped
 public class IndexingForm {
-
+    private static final Logger logger = LogManager.getLogger(IndexingForm.class);
     private static final List<ObjectType> objectTypes = ObjectType.getIndexableObjectTypes();
     private static final String POLLING_CHANNEL_NAME = "togglePollingChannel";
+    private final IndexingService indexingService = ServiceManager.getIndexingService();
+    private static final EnumMap<ObjectType, IndexingRow> indexingRows;
     private String indexingStartedUser = "";
     private LocalDateTime indexingStartedTime = null;
 
     @Inject
     @Push(channel = POLLING_CHANNEL_NAME)
     private PushContext pollingChannel;
+    private boolean progressPolling;
+
+    static {
+        indexingRows = new EnumMap<>(ObjectType.class);
+        for (ObjectType objectType : ObjectType.values()) {
+            if (objectType.isIndexable()) {
+                indexingRows.put(objectType, new IndexingRow(objectType.getBeanClass()));
+            }
+        }
+    }
+
+    public static void setNumberOfDatabaseObjects() {
+        for (Entry<ObjectType, IndexingRow> entry : indexingRows.entrySet()) {
+            long count = 0;
+            try {
+                switch (entry.getKey()) {
+                    case BATCH:
+                        count = ServiceManager.getBatchService().count();
+                        break;
+                    case DOCKET:
+                        count = ServiceManager.getDocketService().count();
+                        break;
+                    case FILTER:
+                        count = ServiceManager.getFilterService().count();
+                        break;
+                    case PROCESS:
+                        count = ServiceManager.getProcessService().count();
+                        break;
+                    case PROJECT:
+                        count = ServiceManager.getProjectService().count();
+                        break;
+                    case RULESET:
+                        count = ServiceManager.getRulesetService().count();
+                        break;
+                    case TASK:
+                        count = ServiceManager.getTaskService().count();
+                        break;
+                    case TEMPLATE:
+                        count = ServiceManager.getTemplateService().count();
+                        break;
+                    case WORKFLOW:
+                        count = ServiceManager.getWorkflowService().count();
+                        break;
+                    default:
+                        throw new IllegalStateException(entry.getKey().getTranslationSingular()
+                                + " is no class for indexing");
+                }
+            } catch (DAOException e) {
+                logger.error(e);
+            }
+            entry.getValue().setNumberOfDatabaseObjects(count);
+        }
+    }
 
     /**
      * Get user which started indexing.
@@ -51,14 +112,6 @@ public String getIndexingStartedUser() {
         return indexingStartedUser;
     }
 
-    /**
-     * Count database objects. Execute it on application start and next on button
-     * click.
-     */
-    public void countDatabaseObjects() {
-        throw new UnsupportedOperationException("currently not implemented");
-    }
-
     /**
      * Get time when indexing has started.
      *
@@ -68,34 +121,25 @@ public LocalDateTime getIndexingStartedTime() {
         return indexingStartedTime;
     }
 
-    /**
-     * Get count of database objects.
-     *
-     * @return value of countDatabaseObjects
-     */
-    public Map<ObjectType, Integer> getCountDatabaseObjects() {
-        return Collections.emptyMap();
-    }
-
     /**
      * Return the total number of all objects that can be indexed.
      *
      * @return long number of all items that can be written to the index
      */
     public long getTotalCount() {
-        return 0;
+        return indexingRows.values().stream().mapToLong(IndexingRow::getCount).sum();
     }
 
     /**
-     * Return the number of indexed objects for the given ObjectType.
+     * Return the number of objects for the given ObjectType.
      *
      * @param objectType
-     *            ObjectType for which the number of indexed objects is returned
+     *            ObjectType for which the number of objects is returned
      *
      * @return number of indexed objects
      */
-    public long getNumberOfIndexedObjects(ObjectType objectType) {
-        return 0;
+    public String getNumberOfObjects(ObjectType objectType) {
+        return indexingRows.get(objectType).getNumberOfObjects();
     }
 
     /**
@@ -105,7 +149,7 @@ public long getNumberOfIndexedObjects(ObjectType objectType) {
      * @return long number of all currently indexed objects
      */
     public long getAllIndexed() {
-        return 0;
+        return indexingRows.values().stream().mapToLong(IndexingRow::getIndexed).filter(indexed -> indexed >= 0).sum();
     }
 
     /**
@@ -115,31 +159,24 @@ public long getAllIndexed() {
      *            type objects that get indexed
      */
     public void callIndexing(ObjectType type) {
-        throw new UnsupportedOperationException("currently not implemented");
-    }
-
-    /**
-     * Index all objects of given type 'objectType'.
-     *
-     * @param type
-     *            type objects that get indexed
-     */
-    public void callIndexingRemaining(ObjectType type) {
-        throw new UnsupportedOperationException("currently not implemented");
+        indexingRows.get(type).callIndexing();
+        pollingChannel.send("indexing_started");
+        progressPolling = true;
     }
 
     /**
      * Starts the process of indexing all objects to the ElasticSearch index.
      */
     public void startAllIndexing() {
-        throw new UnsupportedOperationException("currently not implemented");
-    }
-
-    /**
-     * Starts the process of indexing all objects to the ElasticSearch index.
-     */
-    public void startAllIndexingRemaining() {
-        throw new UnsupportedOperationException("currently not implemented");
+        indexingStartedTime = LocalDateTime.now();
+        indexingStartedUser = ServiceManager.getUserService().getAuthenticatedUser().getFullName();
+        for (IndexingRow indexingRow : indexingRows.values()) {
+            if (!indexingRow.isIndexingInProgress()) {
+                indexingRow.callIndexing();
+            }
+        }
+        pollingChannel.send("indexing_started");
+        progressPolling = true;
     }
 
     /**
@@ -149,36 +186,46 @@ public void startAllIndexingRemaining() {
      * @return the overall progress of the indexing process
      */
     public int getAllIndexingProgress() {
-        return (int) ((getAllIndexed() / (float) getTotalCount()) * 100);
-    }
-
-    /**
-     * Return whether any indexing process is currently in progress or not.
-     *
-     * @return boolean Value indicating whether any indexing process is currently in
-     *         progress or not
-     */
-    public boolean indexingInProgress() {
-        return false;
+        long numerator = 0, denominator = 0;
+        for (IndexingRow indexingRow : indexingRows.values()) {
+            if (indexingRow.getIndexed() >= 0) {
+                numerator += indexingRow.getIndexed();
+                denominator += indexingRow.getCount();
+            }
+        }
+        if (denominator != 0) {
+            return (int) (100 * numerator / denominator);
+        } else {
+            return 0;
+        }
     }
 
     /**
-     * Create mapping which enables sorting and other aggregation functions.
+     * Return whether all indexing processes are currently in progress or not.
      *
-     * @param updatePollingChannel
-     *            flag indicating whether the web socket channel to the frontend
-     *            should be updated with the success status of the mapping creation
-     *            or not.
+     * @return boolean Value indicating whether all indexing processes are
+     *         currently in progress or not
      */
-    public void createMapping(boolean updatePollingChannel) {
-        throw new UnsupportedOperationException("currently not implemented");
+    public boolean indexingInProgress(boolean some) {
+        if (some) {
+            for (IndexingRow indexingRow : indexingRows.values()) {
+                if (!indexingRow.isIndexingInProgress()) {
+                    return false;
+                }
+            }
+            return true;
+        } else {
+            for (IndexingRow indexingRow : indexingRows.values()) {
+                if (indexingRow.isIndexingInProgress()) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 
-    /**
-     * Delete whole ElasticSearch index.
-     */
-    public void deleteIndex() {
-        throw new UnsupportedOperationException("currently not implemented");
+    public boolean indexingInProgress(ObjectType type) {
+        return indexingRows.get(type).isIndexingInProgress();
     }
 
     /**
@@ -188,48 +235,19 @@ public void deleteIndex() {
      * @return String information about the server
      */
     public String getServerInformation() {
-        return "";
+        return indexingService.getServerInformation();
     }
 
     /**
-     * Return the progress in percent of the currently running indexing process. If
-     * the list of entries to be indexed is empty, this will return "0".
+     * Return the progress in percent of the currently running indexing process.
+     * If the list of entries to be indexed is empty, this will return "0".
      *
      * @param currentType
      *            the ObjectType for which the progress will be determined
      * @return the progress of the current indexing process in percent
      */
     public int getProgress(ObjectType currentType) {
-        return 0;
-    }
-
-    /**
-     * Check if current mapping is empty.
-     *
-     * @return true if mapping is empty, otherwise false
-     */
-    public boolean isMappingEmpty() {
-        return false;
-    }
-
-    /**
-     * Tests and returns whether the Elastic Search index has been created or not.
-     *
-     * @return whether the Elastic Search index exists or not
-     */
-    public boolean indexExists() {
-        return false;
-    }
-
-    /**
-     * Return the state of the ES index. -2 = failed deleting the index -1 = failed
-     * creating ES mapping 1 = successfully created ES mapping 2 = successfully
-     * deleted index
-     *
-     * @return state of ES index
-     */
-    public IndexStates getIndexState() {
-        return IndexStates.NO_STATE;
+        return indexingRows.get(currentType).getProgress();
     }
 
     /**
@@ -241,7 +259,7 @@ public IndexStates getIndexState() {
      * @return indexing state of the given object type.
      */
     public IndexStates getObjectIndexState(ObjectType objectType) {
-        return IndexStates.NO_STATE;
+        return indexingRows.get(objectType).getObjectIndexState();
     }
 
     /**
@@ -253,7 +271,18 @@ public IndexStates getObjectIndexState(ObjectType objectType) {
      * @return static variable for global indexing state
      */
     public IndexStates getAllObjectsIndexingState() {
-        return IndexStates.NO_STATE;
+        for (IndexingRow indexingRow : indexingRows.values()) {
+            if (Objects.equals(IndexStates.INDEXING_FAILED, indexingRow.objectIndexState)) {
+                return IndexStates.INDEXING_FAILED;
+            } else if (!Objects.equals(IndexStates.INDEXING_SUCCESSFUL, indexingRow.objectIndexState)) {
+                return IndexStates.NO_STATE;
+            }
+        }
+        if (progressPolling) {
+            progressPolling = false;
+            pollingChannel.send("indexing_finished");
+        }
+        return IndexStates.INDEXING_SUCCESSFUL;
     }
 
     /**
@@ -270,7 +299,6 @@ public ObjectType[] getObjectTypes() {
      *
      * @return JSONArray containing objects type constants.
      */
-    @SuppressWarnings("unused")
     public JsonArray getObjectTypesAsJson() {
         JsonArrayBuilder objectsTypesJson = Json.createArrayBuilder();
         for (ObjectType objectType : objectTypes) {
@@ -294,11 +322,4 @@ public ObjectType getNoneType() {
     public void updateView() {
         Ajax.update("@all");
     }
-
-    /**
-     * Cancel indexing upon user request.
-     */
-    public void cancelIndexing() {
-        throw new UnsupportedOperationException("currently not implemented");
-    }
 }
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/IndexingRow.java b/Kitodo/src/main/java/org/kitodo/production/forms/IndexingRow.java
new file mode 100644
index 00000000000..b7659428c3d
--- /dev/null
+++ b/Kitodo/src/main/java/org/kitodo/production/forms/IndexingRow.java
@@ -0,0 +1,194 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+
+package org.kitodo.production.forms;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.hibernate.search.mapper.pojo.massindexing.MassIndexingMonitor;
+import org.kitodo.data.database.beans.BaseBean;
+import org.kitodo.production.enums.IndexStates;
+import org.kitodo.production.services.ServiceManager;
+import org.kitodo.production.services.index.IndexingService;
+
+/**
+ * A row in the indexing table.
+ */
+public class IndexingRow implements MassIndexingMonitor {
+    private static final Logger logger = LogManager.getLogger(IndexingRow.class);
+    private final IndexingService indexingService = ServiceManager.getIndexingService();
+
+    private final Class<? extends BaseBean> type;
+
+    IndexStates objectIndexState = IndexStates.NO_STATE;
+    private AtomicLong entitiesLoaded = new AtomicLong();
+    private AtomicLong documentsBuilt = new AtomicLong();
+    private AtomicLong documentsAdded = new AtomicLong();
+    private AtomicLong totalCount = new AtomicLong();
+    private long numberOfObjects;
+
+    /**
+     * <b>Constructor.</b> Creates a new table row for the given bean type.
+     * 
+     * @param type
+     *            class of database beans to be indexed
+     */
+    IndexingRow(Class<? extends BaseBean> type) {
+        this.type = type;
+    }
+
+    /**
+     * Starts indexing.
+     */
+    void callIndexing() {
+        long count = totalCount.get();
+        if (count > 0) {
+            numberOfObjects = count;
+        }
+        objectIndexState = IndexStates.INDEXING_STARTED;
+        entitiesLoaded.set(0);
+        documentsBuilt.set(0);
+        documentsAdded.set(0);
+        totalCount.set(0);
+        indexingService.startIndexing(type, this).whenComplete((unused, throwable) -> {
+            if (Objects.isNull(throwable)) {
+                objectIndexState = IndexStates.INDEXING_SUCCESSFUL;
+                logger.info("Indexing complete for {}", type.getSimpleName());
+            } else {
+                logger.error(throwable);
+                objectIndexState = IndexStates.INDEXING_FAILED;
+            }
+        });
+    }
+
+    /**
+     * Returns the total number of objects. Used for the total row of the table.
+     * 
+     * @return the total number of objects
+     */
+    long getCount() {
+        long total = totalCount.get();
+        return total == 0 ? numberOfObjects : total;
+    }
+
+    /**
+     * Returns the number of indexed objects. Used for the total row of the
+     * table.
+     * 
+     * @return the number of indexed objects
+     */
+    long getIndexed() {
+        return documentsAdded.get();
+    }
+
+    /**
+     * Returns the object count for the table row. If the indexer is not
+     * running, this is just the total count. While the indexer is running, this
+     * returns three values ​​before the slash: the number of objects that
+     * Hibernate has already fetched from the database, the number of objects
+     * that have been converted to an indexable JSON document, and the number of
+     * indexed documents. After the slash is always the total number of objects.
+     * 
+     * @return the object count
+     */
+    /* Since the total count also has to be reset when indexing starts, a cached
+     * value is used here so that a zero does not flash in the display in
+     * between. */
+    String getNumberOfObjects() {
+        long objectCount = totalCount.get();
+        if (objectCount == 0) {
+            objectCount = numberOfObjects;
+        }
+        if (IndexStates.NO_STATE.equals(objectIndexState)) {
+            return Long.toString(objectCount);
+        } else {
+            StringBuilder numberOfObjects = new StringBuilder(40);
+            numberOfObjects.append(entitiesLoaded.get());
+            numberOfObjects.append(" \u2012 ");
+            numberOfObjects.append(documentsBuilt.get());
+            numberOfObjects.append(" \u2012 ");
+            numberOfObjects.append(documentsAdded.get());
+            numberOfObjects.append(" / ");
+            numberOfObjects.append(objectCount);
+            return numberOfObjects.toString();
+        }
+    }
+
+    /**
+     * Returns the state of indexing.
+     * 
+     * @return the indexing state
+     */
+    IndexStates getObjectIndexState() {
+        return objectIndexState;
+    }
+
+    /**
+     * Returns the progress of indexing in percent. This is used to display a
+     * progress bar.
+     * 
+     * @return the progress in [0 .. 100]
+     */
+    int getProgress() {
+        long count = getCount();
+        if (count == 0) {
+            return 0;
+        }
+        return (int) (100 * getIndexed() / count);
+    }
+
+    /**
+     * Returns whether indexing is currently running.
+     * 
+     * @return whether indexing is currently running
+     */
+    boolean isIndexingInProgress() {
+        return IndexStates.INDEXING_STARTED.equals(objectIndexState);
+    }
+
+    /**
+     * Sets the number of objects in the database. These are set initially so
+     * that they are not zero everywhere before indexing starts.
+     * 
+     * @param numberOfDatabaseObjects
+     *            number of objects in the database
+     */
+    void setNumberOfDatabaseObjects(long numberOfDatabaseObjects) {
+        this.numberOfObjects = numberOfDatabaseObjects;
+    }
+
+    @Override
+    public void documentsAdded(long increment) {
+        documentsAdded.addAndGet(increment);
+    }
+
+    @Override
+    public void documentsBuilt(long increment) {
+        documentsBuilt.addAndGet(increment);
+    }
+
+    @Override
+    public void entitiesLoaded(long increment) {
+        entitiesLoaded.addAndGet(increment);
+    }
+
+    @Override
+    public void addToTotalCount(long increment) {
+        totalCount.addAndGet(increment);
+    }
+
+    @Override
+    public void indexingCompleted() {
+    }
+}
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/ServiceManager.java b/Kitodo/src/main/java/org/kitodo/production/services/ServiceManager.java
index aeb59ded759..b0ae520905b 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/ServiceManager.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/ServiceManager.java
@@ -46,6 +46,7 @@
 import org.kitodo.production.services.dataformat.MetsService;
 import org.kitodo.production.services.file.FileService;
 import org.kitodo.production.services.image.ImageService;
+import org.kitodo.production.services.index.IndexingService;
 import org.kitodo.production.services.migration.MigrationService;
 import org.kitodo.production.services.ocr.OcrdWorkflowService;
 import org.kitodo.production.services.schema.SchemaService;
@@ -71,6 +72,7 @@ public class ServiceManager {
     private static FolderService folderService;
     private static ImageService imageService;
     private static ImportService importService;
+    private static IndexingService indexingService;
     private static KitodoScriptService kitodoScriptService;
     private static LdapGroupService ldapGroupService;
     private static LdapServerService ldapServerService;
@@ -327,6 +329,12 @@ private static void initializeCommentService() {
         }
     }
 
+    private static void initializeIndexingService() {
+        if (Objects.isNull(indexingService)) {
+            indexingService = IndexingService.getInstance();
+        }
+    }
+
     private static void initializeDataEditorSettingService() {
         if (Objects.isNull(dataEditorSettingService)) {
             dataEditorSettingService = DataEditorSettingService.getInstance();
@@ -742,6 +750,16 @@ public static CommentService getCommentService() {
         return commentService;
     }
 
+    /**
+     * Returns a service instance for indexing.
+     *
+     * @return an indexing service
+     */
+    public static IndexingService getIndexingService() {
+        initializeIndexingService();
+        return indexingService;
+    }
+
     /**
      * Get dataEditorSettingService.
      *
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/BaseBeanService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/BaseBeanService.java
index 0e1e88b2a0e..5ea3393f70c 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/data/BaseBeanService.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/data/BaseBeanService.java
@@ -13,24 +13,24 @@
 
 import io.reactivex.annotations.CheckReturnValue;
 
-import java.util.AbstractCollection;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.regex.Pattern;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.hibernate.query.Query;
 import org.kitodo.data.database.beans.BaseBean;
 import org.kitodo.data.database.exceptions.DAOException;
 import org.kitodo.data.database.persistence.BaseDAO;
 import org.primefaces.model.SortOrder;
 
 public abstract class BaseBeanService<T extends BaseBean, S extends BaseDAO<T>> {
-    private static final Logger logger = LogManager.getLogger(BaseBeanService.class);
-    private static final Pattern PARAMETER_PATTERN = Pattern.compile(":(\\w+)");
+    protected static final EnumMap<SortOrder, String> SORT_ORDER_MAPPING;
+
+    static {
+        SORT_ORDER_MAPPING = new EnumMap<>(SortOrder.class);
+        SORT_ORDER_MAPPING.put(SortOrder.ASCENDING, "ASC");
+        SORT_ORDER_MAPPING.put(SortOrder.DESCENDING, "DESC");
+    }
 
     protected S dao;
 
@@ -150,7 +150,6 @@ public void remove(Integer id) throws DAOException {
      * @return amount of rows in database according to given query
      */
     public Long count(String query) throws DAOException {
-        logger.debug(query);
         return dao.count(query);
     }
 
@@ -164,7 +163,6 @@ public Long count(String query) throws DAOException {
      * @return amount of rows in database according to given query
      */
     public Long count(String query, Map<String, Object> parameters) throws DAOException {
-        debugLogQuery(query, parameters);
         return dao.count(query, parameters);
     }
 
@@ -220,7 +218,6 @@ public T getById(Integer id) throws DAOException {
      * @return list of exact bean objects
      */
     public List<T> getByQuery(String query) {
-        logger.debug(query);
         return dao.getByQuery(query);
     }
 
@@ -234,12 +231,10 @@ public List<T> getByQuery(String query) {
      * @return list of beans objects
      */
     public List<T> getByQuery(String query, Map<String, Object> parameters) {
-        debugLogQuery(query, parameters);
         return dao.getByQuery(query, parameters);
     }
 
     public List<T> getByQuery(String query, Map<String, Object> parameters, int begin, int max) {
-        debugLogQuery(query, parameters, begin, max);
         return dao.getByQuery(query, parameters, begin, max);
     }
 
@@ -258,7 +253,6 @@ public List<T> getByQuery(String query, Map<String, Object> parameters, int begi
      * @return list of exact bean objects
      */
     public List<T> getByQuery(String query, Map<String, Object> parameters, int max) {
-        debugLogQuery(query, parameters, 0, max);
         return dao.getByQuery(query, parameters, 0, max);
     }
 
@@ -275,7 +269,6 @@ public List<T> getByQuery(String query, Map<String, Object> parameters, int max)
      * @return list of strings
      */
     public List<String> getStringList(String query, Map<String, Object> parameters) {
-        debugLogQuery(query, parameters);
         return dao.getStringsByQuery(query, parameters);
     }
 
@@ -351,58 +344,4 @@ protected String getSort(String sortField, SortOrder sortOrder) {
             return "";
         }
     }
-
-    /**
-     * Enters a search query into the log when it is running in debug level.
-     * Placeholders are replaced with their parameter values.
-     * 
-     * @param query
-     *            search query
-     * @param parameters
-     *            parameter values
-     */
-    private static void debugLogQuery(String query, Map<String, Object> parameters) {
-        debugLogQuery(query, parameters, Integer.MIN_VALUE, Integer.MIN_VALUE);
-    }
-
-    /**
-     * Enters a search query into the log when it is running in debug level.
-     * Placeholders are replaced with their parameter values.
-     * 
-     * @param query
-     *            search query
-     * @param parameters
-     *            parameter values
-     * @param initPointer
-     *            can initialize the object pointer to a later object (sets
-     *            {@linkplain Query#setFirstResult(int)})
-     * @param stopCount
-     *            the search stops after count hits (sets
-     *            {@linkplain Query#setMaxResults(int)})
-     */
-    private static void debugLogQuery(String query, Map<String, Object> parameters, int initPointer, int stopCount) {
-        if (logger.isDebugEnabled()) {
-            String resolved = PARAMETER_PATTERN.matcher(query).replaceAll(matchResult -> {
-                Object parameter = parameters.get(matchResult.group(1));
-                if (Objects.isNull(parameter)) {
-                    return matchResult.group();
-                }
-                if (parameter instanceof String) {
-                    return '\'' + ((String) parameter) + '\'';
-                }
-                if (parameter instanceof AbstractCollection) {
-                    return Objects.toString(parameter).replaceFirst("^\\[(.*)\\]$", "$1");
-                }
-                return Objects.toString(parameter);
-            });
-            if (initPointer != Integer.MIN_VALUE || stopCount != Integer.MIN_VALUE) {
-                if (stopCount != Integer.MIN_VALUE) {
-                    resolved = String.format("%s (limit=%d)", resolved, stopCount);
-                } else {
-                    resolved = String.format("%s (limit=%d, offset=%d)", resolved, stopCount, initPointer);
-                }
-            }
-            logger.debug(resolved);
-        }
-    }
 }
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java
new file mode 100644
index 00000000000..9c756101966
--- /dev/null
+++ b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java
@@ -0,0 +1,114 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+
+package org.kitodo.production.services.index;
+
+import java.util.Objects;
+import java.util.concurrent.CompletionStage;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.hibernate.search.mapper.orm.Search;
+import org.hibernate.search.mapper.orm.massindexing.MassIndexer;
+import org.hibernate.search.mapper.pojo.massindexing.MassIndexingMonitor;
+import org.kitodo.data.database.beans.BaseBean;
+import org.kitodo.data.database.persistence.HibernateUtil;
+import org.kitodo.production.helper.Helper;
+
+public class IndexingService {
+
+    private static final Logger logger = LogManager.getLogger(IndexingService.class);
+
+    private static volatile IndexingService instance = null;
+
+    String serverInformation;
+    long serverLastCheck;
+    long serverCheckThreadId;
+
+    /**
+     * Return singleton variable of type IndexingService.
+     *
+     * @return unique instance of IndexingService
+     */
+    public static IndexingService getInstance() {
+        IndexingService localReference = instance;
+        if (Objects.isNull(localReference)) {
+            synchronized (IndexingService.class) {
+                localReference = instance;
+                if (Objects.isNull(localReference)) {
+                    localReference = new IndexingService();
+                    instance = localReference;
+                }
+            }
+        }
+        return localReference;
+    }
+
+    /**
+     * Standard constructor.
+     */
+    private IndexingService() {
+        new Thread(new ServerConnectionChecker(this)).start();
+    }
+
+    /**
+     * Returns the server information. This consists of the server service and
+     * the version number as returned by the search server.
+     * 
+     * <!-- A thread to retrieve the server information is started when the
+     * IndexingService is constructed. If the server information is still null,
+     * the result of this thread is waited for. Otherwise, another thread is
+     * started to retrieve the server information (which will only affect the
+     * next time this information is retrieved) and then the stored server
+     * information is returned. This keeps the comparatively slow HTTP requests
+     * out of the GUI thread and a failure of the search server is still
+     * displayed very promptly. -->
+     * 
+     * @return the server information
+     */
+    public String getServerInformation() {
+        if (Objects.isNull(this.serverInformation)) {
+            try {
+                while (Objects.isNull(this.serverInformation)) {
+                    Thread.sleep(25);
+                }
+            } catch (InterruptedException e) {
+                logger.error(e);
+                return "";
+            }
+        } else {
+            new Thread(new ServerConnectionChecker(this)).start();
+        }
+        if (this.serverInformation.isEmpty()) {
+            Helper.setErrorMessage("elasticSearchNotRunning");
+        }
+        return this.serverInformation;
+    }
+
+    /**
+     * Starts indexing for a bean type.
+     * 
+     * @param type
+     *            class of beans to be indexed
+     * @param monitor
+     *            object to be notified of progress changes
+     * @return a CompletionStage that can react asynchronously when the indexing
+     *         ends (including to exceptions)
+     */
+    public CompletionStage<?> startIndexing(Class<? extends BaseBean> type, MassIndexingMonitor monitor) {
+        MassIndexer massIndexer = Search.session(HibernateUtil.getSession()).massIndexer(type);
+        massIndexer.dropAndCreateSchemaOnStart(true);
+        if (Objects.nonNull(monitor)) {
+            massIndexer.monitor(monitor);
+        }
+        return massIndexer.start();
+    }
+}
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/index/ServerConnectionChecker.java b/Kitodo/src/main/java/org/kitodo/production/services/index/ServerConnectionChecker.java
new file mode 100644
index 00000000000..e9279c3b880
--- /dev/null
+++ b/Kitodo/src/main/java/org/kitodo/production/services/index/ServerConnectionChecker.java
@@ -0,0 +1,97 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+
+package org.kitodo.production.services.index;
+
+import static java.lang.Thread.currentThread;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Objects;
+import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.kitodo.config.KitodoConfig;
+
+/**
+ * Checks the connection to the search service. This is an asynchronous function
+ * to {@link IndexingService}. It uses its variables for inter-thread
+ * communication.
+ */
+class ServerConnectionChecker implements Runnable {
+    private static final Logger logger = LogManager.getLogger(ServerConnectionChecker.class);
+    private static final Pattern PATTERN_SERVER = Pattern.compile("cluster_name\\W+([^\"]*).*?number\\W+([^\"]*)",
+        Pattern.DOTALL);
+    private static final int WAIT_BETWEEN_CHECKS_SECS = 3;
+
+    private final IndexingService indexingService;
+
+    public ServerConnectionChecker(IndexingService indexingService) {
+        this.indexingService = indexingService;
+    }
+
+    @Override
+    public void run() {
+        if (Objects.nonNull(indexingService.serverInformation) && SECONDS.convert(System.nanoTime()
+                - indexingService.serverLastCheck, NANOSECONDS) < WAIT_BETWEEN_CHECKS_SECS) {
+            return;
+        }
+
+        boolean clearId = false;
+        try {
+            if (indexingService.serverCheckThreadId == 0) {
+                indexingService.serverCheckThreadId = currentThread().getId();
+                if (indexingService.serverCheckThreadId == currentThread().getId()) {
+                    clearId = true;
+                    indexingService.serverInformation = downloadServerInformation();
+                    indexingService.serverLastCheck = System.nanoTime();
+                }
+            }
+        } catch (RuntimeException e) {
+            logger.error(e);
+            indexingService.serverInformation = "";
+            indexingService.serverLastCheck = System.nanoTime();
+        } finally {
+            if (clearId) {
+                indexingService.serverCheckThreadId = 0;
+            }
+        }
+    }
+
+    /**
+     * Get search server information.
+     */
+    private static final String downloadServerInformation() {
+        try (InputStream greetStream = KitodoConfig.getSearchServerUrl().openStream();
+                Scanner scanner = new Scanner(greetStream, StandardCharsets.US_ASCII)) {
+            scanner.useDelimiter("\\A");
+            String body = scanner.hasNext() ? scanner.next() : "";
+            Matcher serverMatcher = PATTERN_SERVER.matcher(body);
+            if (serverMatcher.find()) {
+                String serverInformation = serverMatcher.group(1) + ' ' + serverMatcher.group(2);
+                logger.info("Search server found: {}", serverInformation);
+                return serverInformation;
+            } else {
+                throw new InvalidPropertiesFormatException(body);
+            }
+        } catch (IOException | RuntimeException e) {
+            logger.error("elasticSearchNotRunning", e);
+        }
+        return "";
+    }
+}
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/workflow/WorkflowControllerService.java b/Kitodo/src/main/java/org/kitodo/production/services/workflow/WorkflowControllerService.java
index 3c207f8c789..0aecea1ca06 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/workflow/WorkflowControllerService.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/workflow/WorkflowControllerService.java
@@ -52,6 +52,7 @@
 import org.kitodo.production.helper.tasks.TaskManager;
 import org.kitodo.production.metadata.MetadataLock;
 import org.kitodo.production.services.ServiceManager;
+import org.kitodo.production.services.data.CommentService;
 import org.kitodo.production.services.data.TaskService;
 import org.kitodo.production.thread.TaskScriptThread;
 
@@ -63,6 +64,7 @@ public class WorkflowControllerService {
     private final WebDav webDav = new WebDav();
     private static final Logger logger = LogManager.getLogger(WorkflowControllerService.class);
     private final TaskService taskService = ServiceManager.getTaskService();
+    private final CommentService commentService = ServiceManager.getCommentService();
 
     /**
      * Set Task status up.
@@ -372,7 +374,11 @@ public void reportProblem(Comment comment, TaskEditType taskEditType) throws DAO
             correctionTask.setProcessingEnd(null);
             correctionTask.setCorrection(true);
             taskService.save(correctionTask);
-            lockTasksBetweenCurrentAndCorrectionTask(currentTask, correctionTask);
+            if (lockTasksBetweenCurrentAndCorrectionTask(currentTask, correctionTask)
+                    && Objects.nonNull(comment.getId())) {
+                commentService.refresh(comment);
+                currentTask = comment.getCurrentTask();
+            }
         }
         updateProcessSortHelperStatus(currentTask.getProcess());
     }
@@ -474,7 +480,8 @@ private void closeParent(Process process) throws DAOException {
         }
     }
 
-    private void lockTasksBetweenCurrentAndCorrectionTask(Task currentTask, Task correctionTask) throws DAOException {
+    private boolean lockTasksBetweenCurrentAndCorrectionTask(Task currentTask, Task correctionTask)
+            throws DAOException {
         List<Task> allTasksInBetween = taskService.getAllTasksInBetween(correctionTask.getOrdering(),
             currentTask.getOrdering(), currentTask.getProcess().getId());
         for (Task taskInBetween : allTasksInBetween) {
@@ -483,6 +490,7 @@ private void lockTasksBetweenCurrentAndCorrectionTask(Task currentTask, Task cor
             taskInBetween.setProcessingEnd(null);
             taskService.save(taskInBetween);
         }
+        return !allTasksInBetween.isEmpty();
     }
 
     private List<Task> getAllHigherTasks(List<Task> tasks, Task task) {
@@ -684,7 +692,10 @@ private void processAutomaticTask(Task task) {
     public static void updateProcessSortHelperStatus(Process process) {
         if (!process.getTasks().isEmpty()) {
             String value = ProcessConverter.getCombinedProgressAsString(process, false);
+            logger.trace("Setting sortHelperStatus for process {} to '{}'", process, value);
             process.setSortHelperStatus(value);
+        } else {
+            logger.trace("Cannot set sortHelperStatus for process {}: process has no tasks", process);
         }
     }
 
diff --git a/Kitodo/src/main/resources/hibernate.cfg.xml b/Kitodo/src/main/resources/hibernate.cfg.xml
index 5b52c5ce814..3c0731e59a4 100644
--- a/Kitodo/src/main/resources/hibernate.cfg.xml
+++ b/Kitodo/src/main/resources/hibernate.cfg.xml
@@ -37,6 +37,9 @@
         <property name="hibernate.connection.verifyServerCertificate">false</property>
         <property name="hibernate.connection.useSSL">false</property>
 
+        <!-- Hibernate search -->
+        <property name="hibernate.search.schema_management.strategy">drop-and-create</property>
+
         <!-- connection pool -->
         <property name="hibernate.c3p0.max_size">5000</property>
         <property name="hibernate.c3p0.min_size">10</property>
diff --git a/Kitodo/src/main/resources/messages/messages_de.properties b/Kitodo/src/main/resources/messages/messages_de.properties
index 41552d09a55..8102a76196e 100644
--- a/Kitodo/src/main/resources/messages/messages_de.properties
+++ b/Kitodo/src/main/resources/messages/messages_de.properties
@@ -16,7 +16,6 @@ authority=Berechtigung
 DMSExportByThread=Der Vorgang wird vom Taskmanager ins DMS exportiert\:
 DMSExportThreadCreated=Der DMS-Export f\u00FCr den Vorgang wurde im Taskmanager vorbereitet\:
 emptyTask=Beispiel f\u00FCr eine lang laufende Aufgabe
-mapping=ElasticSearch Mapping
 NOT=Enth\u00E4lt nicht
 NoCataloguePluginForCatalogue=Keines der verf\u00fcgbaren OPAC-Plugins unterst\u00fctzt diesen Katalog.
 active=Aktiv
@@ -248,7 +247,6 @@ couldNotCreateImageFolder=Das Verzeichnis f\u00FCr die Images konnte nicht angel
 count=Anzahl
 counting=Z\u00E4hlung
 createExcel=Exceldatei erzeugen
-createMapping=ElasticSearch Mapping erzeugen
 createNewspaperProcessesTask=Anlegen von Zeitungsvorg\u00E4ngen
 createNewBatchFromSelectedProcesses=Neuen Batch aus den gew\u00E4hlten Vorg\u00E4ngen erzeugen
 createNewDocket=Neuen Laufzettel anlegen
@@ -350,7 +348,6 @@ deactivatedTemplates=Deaktivierte Produktionsvorlagen
 defaults=Vorgaben
 delete=L\u00F6schen
 deleteAfterMove=Nach dem Export l\u00F6schen
-deleteIndex=ElasticSearch Index l\u00F6schen
 deleteLinkHomeDirectory=Verlinkung aus Homeverzeichnis entfernen
 deleteMedia=Medien l\u00F6schen
 deleteMediaPartial=Medienteil l\u00F6schen
@@ -1071,7 +1068,6 @@ start=Start
 startDate=Startdatum
 startIndexing=Indexierung starten
 startIndexingAll=Komplette Indexierung starten
-startIndexingRemaining=Indexierung vervollst\u00E4ndigen
 startPage=Startseite
 statisticalEvaluation=Statistische Auswertung
 stateOfVolume=Status der B\u00E4nde
diff --git a/Kitodo/src/main/resources/messages/messages_en.properties b/Kitodo/src/main/resources/messages/messages_en.properties
index 2a8d58a3c7c..365ab1b97d3 100644
--- a/Kitodo/src/main/resources/messages/messages_en.properties
+++ b/Kitodo/src/main/resources/messages/messages_en.properties
@@ -16,7 +16,6 @@ authority=Authority
 DMSExportByThread=The process is being exported into the DMS by the task manager\:
 DMSExportThreadCreated=The DMS export for the process has been prepared in the task manager\:
 emptyTask=Example of a long-running task
-mapping=ElasticSearch mapping
 NOT=does not contain
 NoCataloguePluginForCatalogue=None of the OPAC plugins available is capable of reading this catalogue.
 active=Active
@@ -248,7 +247,6 @@ couldNotCreateImageFolder=Image folder could not be created
 count=Count
 counting=Counting
 createExcel=generate excel
-createMapping=Create ElasticSearch mapping
 createNewspaperProcessesTask=Creation of processes for a newspaper
 createNewBatchFromSelectedProcesses=create new batch of the selected processes
 createNewDocket=Create new docket
@@ -351,7 +349,6 @@ deactivatedTemplates=Deactivated templates
 defaults=Defaults
 delete=Delete
 deleteAfterMove=Delete after export
-deleteIndex=Delete ElasticSearch index
 deleteLinkHomeDirectory=Remove link from home directory
 deleteMedia=Delete media
 deleteMediaPartial=Delete media partial
@@ -1072,7 +1069,6 @@ start=Start
 startDate=Start date
 startIndexing=Start indexing
 startIndexingAll=Start indexing for all
-startIndexingRemaining=Start indexing for not indexed
 startPage=Home page
 statisticalEvaluation=Statistical evaluation
 stateOfVolume=State of volumes
diff --git a/Kitodo/src/main/resources/messages/messages_es.properties b/Kitodo/src/main/resources/messages/messages_es.properties
index bde18535888..fa47d984269 100644
--- a/Kitodo/src/main/resources/messages/messages_es.properties
+++ b/Kitodo/src/main/resources/messages/messages_es.properties
@@ -16,7 +16,6 @@ authority=Autorización
 DMSExportByThread=La tarea se exporta desde el administrador de tareas al DMS\:
 DMSExportThreadCreated=La exportación DMS de la tarea se ha preparado en el administrador de tareas\:
 emptyTask=Ejemplo de una tarea de larga duración
-mapping=Mapeo de ElasticSearch
 NOT=No contiene
 NoCataloguePluginForCatalogue=Ninguno de los plugins de OPAC disponibles soporta este catálogo.
 active=Activo
@@ -244,7 +243,6 @@ couldNotCreateImageFolder=No se ha podido crear el directorio para las imágenes
 count=Número
 counting=Cuenta
 createExcel=Crear un archivo Excel
-createMapping=Crear mapeo de ElasticSearch
 createNewspaperProcessesTask=Crear procesos periodísticos
 createNewBatchFromSelectedProcesses=Crear un nuevo lote a partir de los procesos seleccionados
 createNewDocket=Crear una nueva hoja de ruta
@@ -346,7 +344,6 @@ deactivatedTemplates=Plantillas desactivadas
 defaults=Por defecto
 delete=Borrar
 deleteAfterMove=Borrar después de exportar
-deleteIndex=Eliminar el índice de ElasticSearch
 deleteLinkHomeDirectory=Eliminar el enlace del directorio principal
 deleteMedia=Borrar los medios de comunicación
 deleteFromProject=Eliminar el usuario del proyecto
@@ -1057,7 +1054,6 @@ start=Inicie
 startDate=Fecha de inicio
 startIndexing=Iniciar la indexación
 startIndexingAll=Iniciar la indexación completa
-startIndexingRemaining=Indexación completa
 startPage=Página de inicio
 statisticalEvaluation=Análisis estadístico
 stateOfVolume=Estado de los volúmenes
diff --git a/Kitodo/src/main/webapp/WEB-INF/resources/js/indexing.js b/Kitodo/src/main/webapp/WEB-INF/resources/js/indexing.js
index e227534359e..9f7b487eb43 100644
--- a/Kitodo/src/main/webapp/WEB-INF/resources/js/indexing.js
+++ b/Kitodo/src/main/webapp/WEB-INF/resources/js/indexing.js
@@ -58,8 +58,6 @@ function toggleProgressPolling(message) {
 
 function toggleButtons(state, objectTypes) {
     if(state) {
-        PF('createMapping').enable();
-        PF('deleteIndex').enable();
         for (var i = 0; i < objectTypes.length; i++) {
             if (objectTypes[i] !== 'NONE') {
                 PF('startIndexing' + objectTypes[i]).enable();
@@ -67,8 +65,6 @@ function toggleButtons(state, objectTypes) {
         }
         PF('startIndexingAll').enable();
     } else {
-        PF('createMapping').disable();
-        PF('deleteIndex').disable();
         for (var i = 0; i < objectTypes.length; i++) {
             if (objectTypes[i] !== 'NONE') {
                 PF('startIndexing' + objectTypes[i]).disable();
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexing.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexing.xhtml
index ec93c13e38d..c9841bcd677 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexing.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexing.xhtml
@@ -26,59 +26,11 @@
             </ui:fragment>
             <ui:fragment rendered="#{not empty indexingForm.serverInformation}">
                 <p:panel widgetVar="indexingTable" id="indexingTable">
-                    <table>
-                        <thead>
-                        <tr>
-                            <th colspan="3"><h:outputText value="#{msgs.mapping}"/></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <!-- Create Mapping -->
-                        <tr>
-                            <td colspan="2">
-                                <p:commandButton widgetVar="createMapping"
-                                                 id="createMappingButton"
-                                                 rendered="#{SecurityAccessController.hasAuthorityToEditIndex()}"
-                                                 value="#{msgs.createMapping}"
-                                                 style="width: 100%;"
-                                                 action="#{indexingForm.createMapping(true)}"
-                                                 disabled="#{indexingForm.indexExists() or indexingForm.indexingInProgress()}"
-                                                 update="indexingTable"
-                                                 onclick="createMapping(#{indexingForm.objectTypesAsJson});"/>
-                            </td>
-                            <td>
-                                <p:graphicImage id="create-mapping-loading" alt="in progress" value="/pages/images/ajax-loader.gif" style="max-height: 20px; display: none;"/>
-                                <p:graphicImage id="create-mapping-error" alt="failed" value="/pages/images/fail.svg" style="max-height: 20px;" rendered="#{!indexingForm.indexingInProgress() and indexingForm.indexState == 'CREATING_MAPPING_FAILED'}"/>
-                                <p:graphicImage id="create-mapping-success" alt="success" value="/pages/images/success.svg" style="max-height: 20px;" rendered="#{!indexingForm.indexingInProgress() and indexingForm.indexState == 'CREATING_MAPPING_SUCCESSFUL'}"/>
-                            </td>
-                        </tr>
-                        <!-- Delete Index -->
-                        <tr>
-                            <td colspan="2">
-                                <p:commandButton widgetVar="deleteIndex"
-                                                 id="deleteIndexButton"
-                                                 rendered="#{SecurityAccessController.hasAuthorityToEditIndex()}"
-                                                 value="#{msgs.deleteIndex}"
-                                                 style="width: 100%;"
-                                                 action="#{indexingForm.deleteIndex()}"
-                                                 disabled="#{!indexingForm.indexExists() or indexingForm.indexingInProgress()}"
-                                                 update="indexingTable"
-                                                 onclick="return confirm('Do you REALLY want to delete the whole index?');deleteIndex(#{indexingForm.objectTypesAsJson});"/>
-                            </td>
-                            <td>
-                                <p:graphicImage id="delete-index-loading" alt="in progress" value="/pages/images/ajax-loader.gif" style="max-height: 20px; display: none;"/>
-                                <p:graphicImage id="delete-index-error" alt="failed" value="/pages/images/fail.svg" style="max-height: 20px;" rendered="#{!indexingForm.indexingInProgress() and indexingForm.indexState == 'DELETING_FAILED'}"/>
-                                <p:graphicImage id="delete-index-success" alt="success" value="/pages/images/success.svg" style="max-height: 20px;" rendered="#{!indexingForm.indexingInProgress() and indexingForm.indexState == 'DELETING_SUCCESSFUL'}"/>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
                     <table id="indexingTable">
                         <thead>
                         <tr>
                             <th><h:outputText value="#{msgs.objectType}"/></th>
                             <th><h:outputText value="#{msgs.startIndexingAll}"/></th>
-                            <th><h:outputText value="#{msgs.startIndexingRemaining}"/></th>
                             <th><h:outputText value="#{msgs.progress}"/></th>
                             <th><h:outputText value="#{msgs.indexedEntries}"/></th>
                             <th><h:outputText value="#{msgs.status}"/></th>
@@ -106,16 +58,7 @@
                                                  onclick="PF('allProgress').start();toggleButtons(false, #{indexingForm.objectTypesAsJson});"
                                                  value="#{msgs.startIndexing}"
                                                  action="#{indexingForm.startAllIndexing()}"
-                                                 disabled="#{!indexingForm.indexExists() or indexingForm.mappingEmpty or (indexingForm.indexingInProgress())}"/>
-                            </td>
-                            <td>
-                                <p:commandButton widgetVar="startIndexingAll"
-                                                 id="startIndexingAllRemainingButton"
-                                                 rendered="#{SecurityAccessController.hasAuthorityToEditIndex()}"
-                                                 onclick="PF('allProgress').start();toggleButtons(false, #{indexingForm.objectTypesAsJson});"
-                                                 value="#{msgs.startIndexing}"
-                                                 action="#{indexingForm.startAllIndexingRemaining()}"
-                                                 disabled="#{!indexingForm.indexExists() or indexingForm.mappingEmpty or (indexingForm.indexingInProgress())}"/>
+                                                 disabled="#{indexingForm.indexingInProgress(true)}"/>
                             </td>
                             <td>
                                 <p:progressBar widgetVar="allProgress"
@@ -133,7 +76,7 @@
                                 <p:graphicImage alt="in progress"
                                                 value="/pages/images/ajax-loader.gif"
                                                 style="max-height: 20px;"
-                                                rendered="#{indexingForm.indexingInProgress()}"/>
+                                                rendered="#{indexingForm.indexingInProgress(false)}"/>
                                 <!--@elvariable id="INDEXING_FAILED" type="org.kitodo.production.enums.IndexStates"-->
                                 <p:graphicImage alt="failed"
                                                 value="/pages/images/fail.svg"
@@ -143,7 +86,7 @@
                                 <p:graphicImage alt="success"
                                                 value="/pages/images/success.svg"
                                                 style="max-height: 20px;"
-                                                rendered="#{indexingForm.allObjectsIndexingState == 'INDEXING_SUCCESSFUL' and not indexingForm.indexingInProgress()}" />
+                                                rendered="#{indexingForm.allObjectsIndexingState == 'INDEXING_SUCCESSFUL' and not indexingForm.indexingInProgress(false)}" />
                             </td>
                         </tr>
                         </tbody>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexingRow.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexingRow.xhtml
index edef3d82d8b..972c3e3c591 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexingRow.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/system/indexingRow.xhtml
@@ -27,16 +27,7 @@
                                  value="#{msgs.startIndexing}"
                                  action="#{indexingForm.callIndexing(objectType)}"
                                  styleClass="indexing-button"
-                                 disabled="#{!indexingForm.indexExists() or indexingForm.mappingEmpty or (indexingForm.indexingInProgress() or indexingForm.countDatabaseObjects[objectType] lt 1)}"/>
-            </td>
-            <td>
-                <p:commandButton widgetVar="startIndexing#{objectType}"
-                                 rendered="#{SecurityAccessController.hasAuthorityToEditIndex()}"
-                                 onclick="PF('#{objectType}'+'Progress').start();toggleButtons(false, #{indexingForm.objectTypesAsJson});"
-                                 value="#{msgs.startIndexing}"
-                                 action="#{indexingForm.callIndexingRemaining(objectType)}"
-                                 styleClass="indexing-button"
-                                 disabled="#{!indexingForm.indexExists() or indexingForm.mappingEmpty or (indexingForm.indexingInProgress() or indexingForm.countDatabaseObjects[objectType] lt 1)}"/>
+                                 disabled="#{indexingForm.indexingInProgress(objectType)}"/>
             </td>
             <td>
                 <p:progressBar widgetVar="#{objectType}Progress"
@@ -48,7 +39,7 @@
                 </p:progressBar>
             </td>
             <td style="text-align: right;">
-                <h:outputText value="#{indexingForm.getNumberOfIndexedObjects(objectType)} / #{indexingForm.countDatabaseObjects[objectType]}"/>
+                <h:outputText value="#{indexingForm.getNumberOfObjects(objectType)}"/>
             </td>
             <td>
                 <!--@elvariable id="INDEXING_STARTED" type="org.kitodo.production.enums.IndexStates"-->
diff --git a/Kitodo/src/test/java/org/kitodo/ExtendedNode.java b/Kitodo/src/test/java/org/kitodo/ExtendedNode.java
new file mode 100644
index 00000000000..8b4cfa28a90
--- /dev/null
+++ b/Kitodo/src/test/java/org/kitodo/ExtendedNode.java
@@ -0,0 +1,22 @@
+/*
+ * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+ *
+ * This file is part of the Kitodo project.
+ *
+ * It is licensed under GNU General Public License version 3 or later.
+ *
+ * For the full copyright and license information, please read the
+ * GPL3-License.txt file that was distributed with this source code.
+ */
+package org.kitodo;
+
+import java.util.Collection;
+import org.opensearch.env.Environment;
+import org.opensearch.node.Node;
+import org.opensearch.plugins.Plugin;
+
+public class ExtendedNode extends Node {
+    ExtendedNode(Environment initialEnvironment, Collection<Class<? extends Plugin>> classpathPlugins) {
+        super(initialEnvironment, classpathPlugins, true);
+    }
+}
diff --git a/Kitodo/src/test/java/org/kitodo/MockDatabase.java b/Kitodo/src/test/java/org/kitodo/MockDatabase.java
index 6477a08dfff..12ba45b7c3a 100644
--- a/Kitodo/src/test/java/org/kitodo/MockDatabase.java
+++ b/Kitodo/src/test/java/org/kitodo/MockDatabase.java
@@ -18,6 +18,7 @@
 import com.xebialabs.restito.semantics.Action;
 import com.xebialabs.restito.server.StubServer;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -39,6 +40,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -51,6 +53,7 @@
 import org.kitodo.api.externaldatamanagement.SearchInterfaceType;
 import org.kitodo.api.schemaconverter.FileFormat;
 import org.kitodo.api.schemaconverter.MetadataFormat;
+import org.kitodo.config.ConfigMain;
 import org.kitodo.data.database.beans.Authority;
 import org.kitodo.data.database.beans.Batch;
 import org.kitodo.data.database.beans.Client;
@@ -91,14 +94,22 @@
 import org.kitodo.production.services.workflow.WorkflowControllerService;
 import org.kitodo.production.workflow.model.Converter;
 import org.kitodo.test.utils.ProcessTestUtils;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.env.Environment;
+import org.opensearch.node.Node;
+import org.opensearch.transport.Netty4Plugin;
+import java.nio.file.Path;
 
 /**
  * Insert data to test database.
  */
 public class MockDatabase {
 
+    private static Node node;
     private static final String GLOBAL_ASSIGNABLE = "_globalAssignable";
     private static final String CLIENT_ASSIGNABLE = "_clientAssignable";
+    private static final String HTTP_TRANSPORT_PORT = "9305";
+    private static final String TARGET = "target";
     private static final String CHOICE = "choice";
     private static final String TEST = "test";
     private static final String FIRST_VALUE = "first value";
@@ -125,11 +136,17 @@ public static void stopDatabaseServer() {
     }
 
     public static void startNode() throws Exception {
-        // TODO start an OpenSearch service for Hibernate Search
+        final String nodeName = "index";
+        final String port = ConfigMain.getParameter("elasticsearch.port", "9205");
+        Environment environment = prepareEnvironment(port, nodeName, Paths.get("target", "classes"));
+        removeOldDataDirectories("target/" + nodeName);
+        node = new ExtendedNode(environment, Collections.singleton(Netty4Plugin.class));
+        node.start();
     }
 
     public static void stopNode() throws Exception {
-        // TODO stop OpenSearch service
+        node.close();
+        node = null;
     }
 
     public static void setUpAwaitility() {
@@ -205,6 +222,26 @@ public static void insertForDataEditorTesting() throws Exception {
         insertDataEditorSettings();
     }
 
+    private static void removeOldDataDirectories(String dataDirectory) throws Exception {
+        File dataDir = new File(dataDirectory);
+        if (dataDir.exists()) {
+            FileUtils.deleteDirectory(dataDir);
+        }
+    }
+
+    private static Environment prepareEnvironment(String httpPort, String nodeName, Path configPath) {
+        Settings settings = Settings.builder().put("node.name", nodeName)
+                .put("path.data", TARGET)
+                .put("path.logs", TARGET)
+                .put("path.home", TARGET)
+                .put("http.type", "netty4")
+                .put("http.port", httpPort)
+                .put("transport.tcp.port", HTTP_TRANSPORT_PORT)
+                .put("transport.type", "netty4")
+                .put("action.auto_create_index", "false").build();
+        return new Environment(settings, configPath);
+    }
+
     public static void insertAuthorities() throws DAOException {
         List<Authority> authorities = new ArrayList<>();
 
@@ -1164,6 +1201,7 @@ private static void insertTasks() throws Exception {
                 secondUser.getProcessingTasks().add(task);
             }
             ServiceManager.getTaskService().save(task);
+            firstProcess.getTasks().add(task);
         }
 
         ServiceManager.getUserService().save(firstUser);
@@ -1190,6 +1228,7 @@ private static void insertTasks() throws Exception {
         role.getTasks().add(eleventhTask);
         ServiceManager.getTaskService().save(eleventhTask);
         firstUser.getProcessingTasks().add(eleventhTask);
+        secondProcess.getTasks().add(eleventhTask);
 
         Task twelfthTask = new Task();
         twelfthTask.setTitle("Processed and Some");
@@ -1205,6 +1244,7 @@ private static void insertTasks() throws Exception {
         ServiceManager.getTaskService().save(twelfthTask);
         firstUser.getProcessingTasks().add(twelfthTask);
         ServiceManager.getUserService().save(firstUser);
+        secondProcess.getTasks().add(twelfthTask);
 
         Task thirteenTask = new Task();
         thirteenTask.setTitle("Next Open");
@@ -1217,6 +1257,7 @@ private static void insertTasks() throws Exception {
         thirteenTask.getRoles().add(role);
         role.getTasks().add(thirteenTask);
         ServiceManager.getTaskService().save(thirteenTask);
+        secondProcess.getTasks().add(thirteenTask);
 
         ServiceManager.getRoleService().save(role);
 
diff --git a/Kitodo/src/test/java/org/kitodo/production/forms/IndexingFormIT.java b/Kitodo/src/test/java/org/kitodo/production/forms/IndexingFormIT.java
index 6f65da66f23..6b665f07e65 100644
--- a/Kitodo/src/test/java/org/kitodo/production/forms/IndexingFormIT.java
+++ b/Kitodo/src/test/java/org/kitodo/production/forms/IndexingFormIT.java
@@ -52,18 +52,9 @@ public static void tearDown() throws Exception {
         MockDatabase.stopNode();
     }
 
-    @Test
-    @Ignore("currently not implemented")
-    public void shouldCreateMapping() {
-        Assert.assertFalse(indexingForm.indexExists());
-        indexingForm.createMapping(false);
-        Assert.assertTrue(indexingForm.indexExists());
-    }
-
     @Test
     @Ignore("Not working due to CDI injection problems")
     public void indexingAll() throws Exception {
-        indexingForm.createMapping(false);
         Project project = new Project();
         project.setTitle("TestProject");
         project.setClient(ServiceManager.getClientService().getById(1));
@@ -73,7 +64,7 @@ public void indexingAll() throws Exception {
         process.setProject(project);
         ServiceManager.getProcessService().save(process);
 
-        indexingForm.countDatabaseObjects();
+        IndexingForm.setNumberOfDatabaseObjects();
 
         Process processOne = ServiceManager.getProcessService().getById(1);
         Assert.assertNull("process should not be found in index", processOne.getTitle());
diff --git a/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDataTabTest.java b/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDataTabTest.java
index 72ee6ed19b9..3940f6914c7 100644
--- a/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDataTabTest.java
+++ b/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDataTabTest.java
@@ -15,7 +15,10 @@
 
 import java.util.Locale;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.kitodo.MockDatabase;
 import org.kitodo.data.database.beans.Process;
 import org.kitodo.data.database.beans.Ruleset;
 import org.kitodo.production.helper.TempProcess;
@@ -25,6 +28,17 @@
 
 public class ProcessDataTabTest {
 
+    @BeforeClass
+    public static void setUp() throws Exception {
+        MockDatabase.startNode();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        MockDatabase.stopNode();
+        MockDatabase.cleanDatabase();
+    }
+
     /**
      * Test the generation of atstsl fields.
      *
diff --git a/Kitodo/src/test/java/org/kitodo/production/services/command/CommandServiceTest.java b/Kitodo/src/test/java/org/kitodo/production/services/command/CommandServiceTest.java
index 98c42861b7c..a1356f55c2d 100644
--- a/Kitodo/src/test/java/org/kitodo/production/services/command/CommandServiceTest.java
+++ b/Kitodo/src/test/java/org/kitodo/production/services/command/CommandServiceTest.java
@@ -158,7 +158,7 @@ public void runNotExistingScriptAsync() throws InterruptedException {
         String commandString = scriptPath + "not_existing_script" + scriptExtension;
         CommandService service = new CommandService();
         service.runCommandAsync(commandString);
-        Thread.sleep(1000); // wait for async thread to finish;
+        Thread.sleep(2000); // wait for async thread to finish;
         CommandResult result = getLastFinishedCommandResult(service.getFinishedCommandResults());
         assertNotNull("There were no results!", result);
         assertTrue("result message should contain IOException",
@@ -173,7 +173,7 @@ public void runScriptParametersAsync() throws InterruptedException {
         parameter.add("HelloWorld");
         CommandService service = new CommandService();
         service.runCommandAsync(file, parameter);
-        Thread.sleep(1000); // wait for async thread to finish;
+        Thread.sleep(2000); // wait for async thread to finish;
         CommandResult result = getLastFinishedCommandResult(service.getFinishedCommandResults());
 
         ArrayList<String> expectedMessages = new ArrayList<>();
diff --git a/Kitodo/src/test/java/org/kitodo/production/services/workflow/WorkflowControllerServiceIT.java b/Kitodo/src/test/java/org/kitodo/production/services/workflow/WorkflowControllerServiceIT.java
index 09b0afa4a0b..cd07bd6e676 100644
--- a/Kitodo/src/test/java/org/kitodo/production/services/workflow/WorkflowControllerServiceIT.java
+++ b/Kitodo/src/test/java/org/kitodo/production/services/workflow/WorkflowControllerServiceIT.java
@@ -450,7 +450,7 @@ public void shouldReportProblem() throws Exception {
             "Report of problem was incorrect - task '" + correctionTask.getTitle() + "' is not a correction task!",
             correctionTask.isCorrection());
 
-        Process process = currentTask.getProcess();
+        Process process = problem.getCurrentTask().getProcess();
         for (Task task : process.getTasks()) {
             if (correctionTask.getOrdering() < task.getOrdering() && task.getOrdering() < currentTask.getOrdering()) {
                 assertEquals("Report of problem was incorrect - tasks between were not set up to locked!",
diff --git a/Kitodo/src/test/resources/hibernate.properties b/Kitodo/src/test/resources/hibernate.properties
new file mode 100644
index 00000000000..df790634709
--- /dev/null
+++ b/Kitodo/src/test/resources/hibernate.properties
@@ -0,0 +1,3 @@
+hibernate.search.enabled=true
+hibernate.search.backend.hosts=localhost:9205
+hibernate.search.backend.protocol=http
diff --git a/Kitodo/src/test/resources/log4j2.xml b/Kitodo/src/test/resources/log4j2.xml
index 1e82cf90bc0..be6d1f64c40 100644
--- a/Kitodo/src/test/resources/log4j2.xml
+++ b/Kitodo/src/test/resources/log4j2.xml
@@ -27,6 +27,9 @@
         <Logger name="org.kitodo" level="debug" additivity="false">
             <AppenderRef ref="STDOUT"/>
         </Logger>
+        <Logger name="org.opensearch.node" level="info" additivity="false">
+            <AppenderRef ref="STDOUT"/>
+        </Logger>
         <Root level="error">
             <AppenderRef ref="STDOUT"/>
         </Root>
diff --git a/Kitodo/src/test/resources/scripts/script_deleteSymLink.bat b/Kitodo/src/test/resources/scripts/script_deleteSymLink.bat
new file mode 100644
index 00000000000..b87e51ec5b5
--- /dev/null
+++ b/Kitodo/src/test/resources/scripts/script_deleteSymLink.bat
@@ -0,0 +1,12 @@
+:: * (c) Kitodo. Key to digital objects e. V. <contact@kitodo.org>
+:: *
+:: * This file is part of the Kitodo project.
+:: *
+:: * It is licensed under GNU General Public License version 3 or later.
+:: *
+:: * For the full copyright and license information, please read the
+:: * GPL3-License.txt file that was distributed with this source code.
+:: *
+
+:: Nothing to do. -- Creating and removing symbolic links is not allowed on
+:: Windows as a non-admin.
diff --git a/Kitodo/src/test/resources/selenium/resources/hibernate.properties b/Kitodo/src/test/resources/selenium/resources/hibernate.properties
new file mode 100644
index 00000000000..df790634709
--- /dev/null
+++ b/Kitodo/src/test/resources/selenium/resources/hibernate.properties
@@ -0,0 +1,3 @@
+hibernate.search.enabled=true
+hibernate.search.backend.hosts=localhost:9205
+hibernate.search.backend.protocol=http
diff --git a/pom.xml b/pom.xml
index 337029ccb40..495f1899664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <org.apache.avalon.framework.version>4.3.1</org.apache.avalon.framework.version>
         <hamcrest.version>2.2-rc1</hamcrest.version>
         <hibernate.version>5.6.10.Final</hibernate.version>
+        <hibernate-search.version>6.2.4.Final</hibernate-search.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
         <jaxb.glassfish-runtime.version>2.3.6</jaxb.glassfish-runtime.version>
         <jaxb2-basics-runtime.version>1.11.1</jaxb2-basics-runtime.version>
@@ -66,6 +67,7 @@
         <saxon.version>9.9.1-8</saxon.version>
         <log4j.version>2.19.0</log4j.version>
         <junit.version>5.9.2</junit.version>
+        <opensearch.version>1.3.19</opensearch.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
 
         <!-- maven-resources-plugin versions greater 3.2.0 introduce changes that
@@ -530,6 +532,18 @@ from system library in Java 11+ -->
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opensearch</groupId>
+                <artifactId>opensearch</artifactId>
+                <version>${opensearch.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opensearch.plugin</groupId>
+                <artifactId>transport-netty4-client</artifactId>
+                <version>${opensearch.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.jvnet.jaxb2_commons</groupId>
                 <artifactId>jaxb2-basics-runtime</artifactId>