--- a/src/main/java/de/mpiwg/itgroup/ismi/browse/AbstractEntityRepositoryBean.java	Tue Nov 01 19:45:16 2016 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/browse/AbstractEntityRepositoryBean.java	Thu Nov 03 20:10:58 2016 +0100
@@ -83,26 +83,31 @@
 		this.updateDefinitions(getWrapper().getLWDefinitions());		
 	}
 	
-	private void updateAdvancedEntities() {
-		if (StringUtils.isNotEmpty(getObjectClass())) {
-			this.advancedPaginator.initCount();
-			int startRecord = this.advancedPaginator.getCurrentPage()
-					* this.advancedPaginator.getItemsPerPage();
-			if((this.advancedPaginator.getCurrentPage() + 1) == this.advancedPaginator.getNumberOfPages()){
-				int mod = this.entities.size() % advancedPaginator.getItemsPerPage();
-				if(mod == 0){
-					this.currentEntities = entities.subList(startRecord, startRecord + this.advancedPaginator.getItemsPerPage());
-				}else{
-					this.currentEntities = entities.subList(startRecord, startRecord + mod);	
-				}
-				
-			}else{
-				this.currentEntities = entities.subList(startRecord, startRecord + this.advancedPaginator.getItemsPerPage());	
-			}
-			
-		} else
-			this.currentEntities = new ArrayList<Entity>();
-	}
+    /**
+     * Put the current subset of this.entites in this.currentEntities.
+     */
+    private void updateAdvancedEntities() {
+        if (StringUtils.isNotEmpty(getObjectClass())) {
+            this.advancedPaginator.initCount();
+            int startRecord = this.advancedPaginator.getCurrentPage() * this.advancedPaginator.getItemsPerPage();
+            if ((this.advancedPaginator.getCurrentPage() + 1) == this.advancedPaginator.getNumberOfPages()) {
+                int mod = this.entities.size() % advancedPaginator.getItemsPerPage();
+                if (mod == 0) {
+                    this.currentEntities = entities.subList(startRecord,
+                            startRecord + this.advancedPaginator.getItemsPerPage());
+                } else {
+                    this.currentEntities = entities.subList(startRecord, startRecord + mod);
+                }
+
+            } else {
+                this.currentEntities = entities.subList(startRecord,
+                        startRecord + this.advancedPaginator.getItemsPerPage());
+            }
+        } else {
+            // empty object_class
+            this.currentEntities = new ArrayList<Entity>();
+        }
+    }
 	
 	public String advancedFirst() {
 		this.advancedPaginator.first();