diff --git a/app/src/main/java/com/acitelight/aether/viewModel/ComicScreenViewModel.kt b/app/src/main/java/com/acitelight/aether/viewModel/ComicScreenViewModel.kt
index 11abd26..942e036 100644
--- a/app/src/main/java/com/acitelight/aether/viewModel/ComicScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/ComicScreenViewModel.kt
@@ -58,15 +58,12 @@ class ComicScreenViewModel : ViewModel() {
         viewModelScope.launch {
             val l = MediaManager.listComics()
             val m = MediaManager.queryComicInfoBulk(l)
+
             if(m != null) {
-                for(i in m)
-                {
-                    comics.add(i)
-                    for(j in i.comic.tags)
-                    {
-                        insertItem(j)
-                    }
-                }
+                comics.addAll(m.sortedWith(compareBy(naturalOrder()) { it.comic.comic_name }))
+                tags.addAll(m.flatMap { it.comic.tags }.groupingBy { it }.eachCount()
+                    .entries.sortedByDescending { it.value }
+                    .map { it.key })
             }
         }
     }
diff --git a/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt b/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
index b756bb7..5e82f32 100644
--- a/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
+++ b/app/src/main/java/com/acitelight/aether/viewModel/VideoScreenViewModel.kt
@@ -57,15 +57,12 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
             classesMap[it] = mutableStateListOf<Video>()
         }
         updatingMap[0] = true
-        val vl = MediaManager.queryVideoBulk(classes[0],
-            queryVideoKlasses(classes[0])
-        )
+        val vl = MediaManager.queryVideoBulk(classes[0], queryVideoKlasses(classes[0]))
 
-        if(vl != null)
-            for(it in vl)
-            {
-                classesMap[classes[0]]?.insertInNaturalOrder(it)
-            }
+        if(vl != null){
+            val r = vl.sortedWith(compareBy(naturalOrder()) { it.video.name })
+            classesMap[classes[0]]?.addAll(r)
+        }
     }
 
     fun setTabIndex(index: Int)
@@ -77,15 +74,12 @@ class VideoScreenViewModel(application: Application) : AndroidViewModel(applicat
 
             updatingMap[index] = true
 
-            val vl = MediaManager.queryVideoBulk(classes[index],
-                queryVideoKlasses(classes[index])
-            )
+            val vl = MediaManager.queryVideoBulk(classes[index], queryVideoKlasses(classes[index]))
 
-            if(vl != null)
-                for(it in vl)
-                {
-                    classesMap[classes[index]]?.insertInNaturalOrder(it)
-                }
+            if(vl != null){
+                val r = vl.sortedWith(compareBy(naturalOrder()) { it.video.name })
+                classesMap[classes[index]]?.addAll(r)
+            }
         }
     }