diff --git a/codbex-number-generator/codbex-number-generator.gen b/codbex-number-generator/codbex-number-generator.gen
index cb3a6d5..5ed8529 100644
--- a/codbex-number-generator/codbex-number-generator.gen
+++ b/codbex-number-generator/codbex-number-generator.gen
@@ -1,24 +1,16 @@
 {
   "tablePrefix": "CODBEX_",
   "brand": "codbex",
-  "brandUrl": "https://www.codbex.com/",
-  "title": "Number Generator Management Module",
-  "description": "Managing Number Generator Data",
-  "fileName": "codbex-number-generator",
-  "genFolderName": "codbex-number-generator",
-  "dataSource": "DefaultDB",
-  "roles": [
-    {
-      "entityName": "Number",
-      "roleRead": "codbex-number-generator.Numbers.NumberReadOnly",
-      "roleWrite": "codbex-number-generator.Numbers.NumberFullAccess"
-    }
-  ],
-  "tprefix": "codbex-number-generator-model",
+  "brandUrl": "https://www.codbex.com",
+  "title": "Number Generator Management Application",
+  "description": "Managing number generator data",
   "projectName": "codbex-number-generator",
   "workspaceName": "workspace",
   "filePath": "codbex-number-generator.model",
   "templateId": "template-application-angular-v2/template/template.js",
+  "fileName": "codbex-number-generator",
+  "genFolderName": "codbex-number-generator",
+  "dataSource": "DefaultDB",
   "perspectives": {
     "Settings": {
       "views": [
@@ -33,6 +25,14 @@
       "role": ""
     }
   },
+  "roles": [
+    {
+      "entityName": "Number",
+      "roleRead": "codbex-number-generator.Numbers.NumberReadOnly",
+      "roleWrite": "codbex-number-generator.Numbers.NumberFullAccess"
+    }
+  ],
+  "tprefix": "codbex-number-generator-model",
   "models": [
     {
       "properties": [
diff --git a/codbex-number-generator/gen/codbex-number-generator/api/Settings/NumberController.ts b/codbex-number-generator/gen/codbex-number-generator/api/Settings/NumberController.ts
index 68a952f..2292216 100644
--- a/codbex-number-generator/gen/codbex-number-generator/api/Settings/NumberController.ts
+++ b/codbex-number-generator/gen/codbex-number-generator/api/Settings/NumberController.ts
@@ -27,7 +27,7 @@ class NumberController {
             const options: Options = {
                 limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
                 offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
-                language: request.getLocale().split("_")[0]
+                language: request.getLocale()?.split("_")[0]
             };
 
             return this.repository.findAll(options);
@@ -96,7 +96,7 @@ class NumberController {
             this.checkPermissions('read');
             const id = parseInt(ctx.pathParameters.id);
             const options: Options = {
-                language: request.getLocale().split("_")[0]
+                language: request.getLocale()?.split("_")[0]
             };
             const entity = this.repository.findById(id, options);
             if (entity) {
diff --git a/codbex-number-generator/gen/codbex-number-generator/ui/Settings/Number/dialog-filter/controller.js b/codbex-number-generator/gen/codbex-number-generator/ui/Settings/Number/dialog-filter/controller.js
index a871d45..0b20871 100644
--- a/codbex-number-generator/gen/codbex-number-generator/ui/Settings/Number/dialog-filter/controller.js
+++ b/codbex-number-generator/gen/codbex-number-generator/ui/Settings/Number/dialog-filter/controller.js
@@ -75,4 +75,5 @@ angular.module('page', ['blimpKit', 'platformView', 'platformLocale']).controlle
 	$scope.clearErrorMessage = () => {
 		$scope.errorMessage = null;
 	};
+
 });
\ No newline at end of file