diff --git a/htroot/Table_API_p.java b/htroot/Table_API_p.java
index 9675a7c93..badc9787e 100644
--- a/htroot/Table_API_p.java
+++ b/htroot/Table_API_p.java
@@ -240,7 +240,7 @@ public class Table_API_p {
         try {
             tablesize = sb.tables.size(WorkTables.TABLE_API_NAME);
             final Iterator<Tables.Row> plainIterator = sb.tables.iterator(WorkTables.TABLE_API_NAME);
-            final Iterator<Tables.Row> mapIterator = sb.tables.orderBy(plainIterator, -1, WorkTables.TABLE_API_COL_DATE_RECORDING).iterator();
+            final Iterator<Tables.Row> mapIterator = Tables.orderBy(plainIterator, -1, WorkTables.TABLE_API_COL_DATE_RECORDING).iterator();
             Tables.Row r;
             boolean dark = true;
             boolean scheduledactions = false;
diff --git a/htroot/Table_YMark_p.java b/htroot/Table_YMark_p.java
index 786f7d5a2..da3e8eadb 100644
--- a/htroot/Table_YMark_p.java
+++ b/htroot/Table_YMark_p.java
@@ -243,7 +243,7 @@ public class Table_YMark_p {
                     	final String tagsString = YMarkUtil.cleanTagsString(post.get(YMarkEntry.BOOKMARK.TAGS.key()));
                     	mapIterator = sb.tables.bookmarks.getBookmarksByTag(bmk_user, tagsString);
                     } else {
-                    	mapIterator = sb.tables.orderByPK(sb.tables.iterator(table, matcher), maxcount, false).iterator();
+                    	mapIterator = Tables.orderByPK(sb.tables.iterator(table, matcher), maxcount, false).iterator();
                     }
 
                     Tables.Row row;
diff --git a/htroot/Tables_p.java b/htroot/Tables_p.java
index ad5bbaf5b..d2c3cc5ee 100644
--- a/htroot/Tables_p.java
+++ b/htroot/Tables_p.java
@@ -160,7 +160,7 @@ public class Tables_p {
                 count = 0;
                 try {
                     final Iterator<Tables.Row> plainIterator = sb.tables.iterator(table, matcher);
-                    final Iterator<Tables.Row> mapIterator = sb.tables.orderByPK(plainIterator, maxcount, false).iterator();
+                    final Iterator<Tables.Row> mapIterator = Tables.orderByPK(plainIterator, maxcount, false).iterator();
                     Tables.Row row;
                     boolean dark = true;
                     byte[] cell;
diff --git a/htroot/api/table_p.java b/htroot/api/table_p.java
index ba7b3b2b1..f0360a90f 100644
--- a/htroot/api/table_p.java
+++ b/htroot/api/table_p.java
@@ -155,7 +155,7 @@ public class table_p {
         int count = 0;
         try {
             final Iterator<Tables.Row> plainIterator = sb.tables.iterator(table, matcher);
-            final Iterator<Tables.Row> mapIterator = sb.tables.orderByPK(plainIterator, maxcount, false).iterator();
+            final Iterator<Tables.Row> mapIterator = Tables.orderByPK(plainIterator, maxcount, false).iterator();
             Tables.Row trow;
             boolean dark = true;
             String cellName, cellValue;
diff --git a/source/net/yacy/document/parser/augment/AugmentParser.java b/source/net/yacy/document/parser/augment/AugmentParser.java
index bede9830e..c970f5d4f 100644
--- a/source/net/yacy/document/parser/augment/AugmentParser.java
+++ b/source/net/yacy/document/parser/augment/AugmentParser.java
@@ -14,6 +14,7 @@ import net.yacy.document.AbstractParser;
 import net.yacy.document.Document;
 import net.yacy.document.Parser;
 import net.yacy.document.parser.rdfa.impl.RDFaParser;
+import net.yacy.kelondro.blob.Tables;
 import net.yacy.search.Switchboard;
 
 
@@ -64,7 +65,7 @@ public class AugmentParser extends AbstractParser implements Parser {
         Iterator<net.yacy.kelondro.blob.Tables.Row> it;
         try {
             it = Switchboard.getSwitchboard().tables.iterator("aggregatedtags");
-            it = Switchboard.getSwitchboard().tables.orderBy(it, -1, "timestamp_creation").iterator();
+            it = Tables.orderBy(it, -1, "timestamp_creation").iterator();
             while (it.hasNext()) {
                 net.yacy.kelondro.blob.Tables.Row r = it.next();
                 if (r.get("url", "").equals(url.toNormalform(false))) {
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index e1a6bfcdf..06319f186 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -2402,7 +2402,7 @@ public final class Switchboard extends serverSwitch {
         
         try {
             final Iterator<Tables.Row> plainIterator = this.tables.iterator(WorkTables.TABLE_API_NAME);
-            final Iterator<Tables.Row> mapIterator = this.tables.orderBy(plainIterator, -1, WorkTables.TABLE_API_COL_DATE_RECORDING).iterator();
+            final Iterator<Tables.Row> mapIterator = Tables.orderBy(plainIterator, -1, WorkTables.TABLE_API_COL_DATE_RECORDING).iterator();
             while (mapIterator.hasNext()) {
                 row = mapIterator.next();
                 if (row == null) continue;