diff --git a/src/app/priority/models/PriorityModelAbstract.php b/src/app/priority/models/PriorityModelAbstract.php
index f2129b53684acc3680cbfeddbf29fcc79049d346..3442bbf4517538782c8418101d2d2b11c2a1bfdc 100644
--- a/src/app/priority/models/PriorityModelAbstract.php
+++ b/src/app/priority/models/PriorityModelAbstract.php
@@ -21,13 +21,16 @@ abstract class PriorityModelAbstract
     public static function get(array $aArgs = [])
     {
         ValidatorModel::arrayType($aArgs, ['select', 'where', 'data', 'orderBy']);
+        ValidatorModel::intType($aArgs, ['limit', 'offset']);
 
         $aReturn = DatabaseModel::select([
             'select'    => empty($aArgs['select']) ? ['*'] : $aArgs['select'],
             'table'     => ['priorities'],
-            'where'     => $aArgs['where'],
-            'data'      => $aArgs['data'],
-            'order_by'  => $aArgs['orderBy']
+            'where'     => empty($aArgs['where']) ? [] : $aArgs['where'],
+            'data'      => empty($aArgs['data']) ? [] : $aArgs['data'],
+            'order_by'  => empty($aArgs['orderBy']) ? [] : $aArgs['orderBy'],
+            'offset'    => empty($aArgs['offset']) ? 0 : $aArgs['offset'],
+            'limit'     => empty($aArgs['limit']) ? 0 : $aArgs['limit']
         ]);
 
         return $aReturn;
diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php
index 0302bac10cd81d6a3c8941d540053019c1cce5fa..192304813044096b8853d6a7a895e026816fe340 100644
--- a/src/core/controllers/CoreController.php
+++ b/src/core/controllers/CoreController.php
@@ -50,14 +50,11 @@ class CoreController
             foreach ($scriptsToInject as $value) {
                 if ($i == 0 && strstr($value, 'scripts.') !== false) {
                     $aInit['scriptsToinject'][] = $value;
-                }
-                if ($i == 1 && strstr($value, 'main.') !== false) {
+                } elseif ($i == 1 && strstr($value, 'main.') !== false) {
                     $aInit['scriptsToinject'][] = $value;
-                }
-                if ($i == 2 && strstr($value, 'runtime.') !== false) {
+                } elseif ($i == 2 && strstr($value, 'runtime.') !== false) {
                     $aInit['scriptsToinject'][] = $value;
-                }
-                if ($i == 3 && strstr($value, 'vendor.') !== false) {
+                } elseif ($i == 3 && strstr($value, 'vendor.') !== false) {
                     $aInit['scriptsToinject'][] = $value;
                 }
             }
diff --git a/src/core/models/DatabaseModel.php b/src/core/models/DatabaseModel.php
index afddc16981b65885eda085a014ef3558858b9720..c2fc643306548507a851fafc809ea74be6228900 100755
--- a/src/core/models/DatabaseModel.php
+++ b/src/core/models/DatabaseModel.php
@@ -110,6 +110,13 @@ class DatabaseModel
             $orderBy = ' ORDER BY ' . implode(', ', $args['order_by']);
         }
 
+        if (empty($args['offset'])) {
+            $offset = '';
+        } else {
+            ValidatorModel::intType($args, ['offset']);
+            $offset = " OFFSET {$args['offset']}";
+        }
+
         if (empty($args['limit'])) {
             $limit = '';
         } else {
@@ -131,7 +138,7 @@ class DatabaseModel
             $limit = $limitData['limit'];
         }
 
-        $query = "SELECT {$select} FROM {$args['table']}{$where}{$groupBy}{$orderBy}{$limit}";
+        $query = "SELECT {$select} FROM {$args['table']}{$where}{$groupBy}{$orderBy}{$offset}{$limit}";
 
         $stmt = $db->query($query, $args['data']);