diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php b/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
index b4712eb7b..66c1390d1 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryCriteria.php
@@ -20,10 +20,7 @@ class CategoryCriteria extends EntryCriteria
     }
 
     public function getMainCats() {
-        $mainCats = $this->categoryRepository->newQuery()
-            ->whereNull('parent_category_id')
-            ->orderBy('sort_order')
-            ->get();
+        $mainCats = $this->categoryRepository->mainCats();
 
         foreach ($mainCats as $cat) {
             $subCount = $this->categoryRepository->newQuery()->where('parent_category_id', $cat->id)->count();
diff --git a/addons/default/visiosoft/location-module/src/City/CityCriteria.php b/addons/default/visiosoft/location-module/src/City/CityCriteria.php
index d49bd26a6..ee57d86bd 100644
--- a/addons/default/visiosoft/location-module/src/City/CityCriteria.php
+++ b/addons/default/visiosoft/location-module/src/City/CityCriteria.php
@@ -5,8 +5,6 @@ use Anomaly\Streams\Platform\Entry\EntryCriteria;
 class CityCriteria extends EntryCriteria
 {
     public function getSubCities($city) {
-        $this->query->where('parent_country_id', $city)->get();
-
-        return $this;
+        return $this->query->where('parent_country_id', $city)->get();
     }
 }