Index: dbLearnStar-model/pom.xml
===================================================================
--- dbLearnStar-model/pom.xml	(revision 8640fb3eb1c2949f7e78580bf4f958749baf0f43)
+++ dbLearnStar-model/pom.xml	(revision 2e86267f8183fc33f0a79c2b3a730f4b4a0eecf3)
@@ -4,5 +4,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar-model</artifactId>
-	<version>0.0.8-SNAPSHOT</version>
+	<version>0.0.9-SNAPSHOT</version>
 
 	<name>dbLearnStar - Model</name>
Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java
===================================================================
--- dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java	(revision 8640fb3eb1c2949f7e78580bf4f958749baf0f43)
+++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ComparatorTestCollection.java	(revision 2e86267f8183fc33f0a79c2b3a730f4b4a0eecf3)
@@ -21,5 +21,8 @@
 package dblearnstar.model.model;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 
 import dblearnstar.model.entities.TestCollection;
@@ -27,21 +30,30 @@
 public class ComparatorTestCollection implements Comparator<TestCollection> {
 
-	public String getCoding(TestCollection i) {
+	public List<Integer> getCoding(TestCollection i) {
 		Integer broj = i.getOrdering();
 		if (broj == null) {
 			broj = 0;
 		}
+		List<Integer> l;
 		if (i.getParentCollection() == null) {
-			return Long.toString(broj) + "-";
+			l = new ArrayList<Integer>();
 		} else {
-			return getCoding(i.getParentCollection()) + Long.toString(broj) + "-";
+			l = getCoding(i.getParentCollection());
 		}
+		l.add(broj);
+		return l;
 	}
 
 	@Override
-	public int compare(TestCollection o1, TestCollection o2) {
-		String hier1 = getCoding(o1);
-		String hier2 = getCoding(o2);
-		return hier1.compareTo(hier2);
+	public int compare(TestCollection tc1, TestCollection tc2) {
+		List<Integer> o1 = getCoding(tc1);
+		List<Integer> o2 = getCoding(tc2);
+		for (int i = 0; i < Math.min(o1.size(), o2.size()); i++) {
+			int c = o1.get(i).compareTo(o2.get(i));
+			if (c != 0) {
+				return c;
+			}
+		}
+		return Integer.compare(o1.size(), o2.size());
 	}
 
Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml	(revision 8640fb3eb1c2949f7e78580bf4f958749baf0f43)
+++ dbLearnStar-webApp/pom.xml	(revision 2e86267f8183fc33f0a79c2b3a730f4b4a0eecf3)
@@ -14,5 +14,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar</artifactId>
-	<version>0.10.0</version>
+	<version>0.11.0</version>
 	<name>dbLearnStar</name>
 
@@ -43,5 +43,5 @@
 
 		<spring-boot-version>2.7.18</spring-boot-version>
-		<tapestry-version>5.8.4</tapestry-version>
+		<tapestry-version>5.8.7</tapestry-version>
 		<jackson-version>2.13.5</jackson-version>
 		<log4j-version>2.23.0</log4j-version>
@@ -65,5 +65,5 @@
 			<groupId>dblearnstar</groupId>
 			<artifactId>dblearnstar-model</artifactId>
-			<version>0.0.8-SNAPSHOT</version>
+			<version>0.0.9-SNAPSHOT</version>
 		</dependency>
 
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java	(revision 8640fb3eb1c2949f7e78580bf4f958749baf0f43)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/ExamsAndTasksOverviewPage.java	(revision 2e86267f8183fc33f0a79c2b3a730f4b4a0eecf3)
@@ -149,7 +149,4 @@
 			return null;
 		} else {
-			ComparatorTestCollection c = new ComparatorTestCollection();
-			Collections.sort(list, c);
-			// return selectModelFactory.create(list, "title");
 			return new TestCollectionSelectModel(list, translationService, persistentLocale);
 		}
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java	(revision 8640fb3eb1c2949f7e78580bf4f958749baf0f43)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/TestCollectionManagement.java	(revision 2e86267f8183fc33f0a79c2b3a730f4b4a0eecf3)
@@ -122,16 +122,4 @@
 	}
 
-	public String getCoding(TestCollection i) {
-		Integer broj = i.getOrdering();
-		if (broj == null) {
-			broj = 0;
-		}
-		if (i.getParentCollection() == null) {
-			return Long.toString(broj) + "-";
-		} else {
-			return getCoding(i.getParentCollection()) + Long.toString(broj) + "-";
-		}
-	}
-
 	public List<TestCollection> getListTestCollections() {
 		List<TestCollection> list = UsefulMethods.castList(TestCollection.class,