diff --git a/src/Repository/Query/ActivityQuery.php b/src/Repository/Query/ActivityQuery.php
index 9b28e70b..635f31aa 100644
--- a/src/Repository/Query/ActivityQuery.php
+++ b/src/Repository/Query/ActivityQuery.php
@@ -16,7 +16,7 @@ use App\Entity\Project;
  */
 class ActivityQuery extends ProjectQuery
 {
-    public const ACTIVITY_ORDER_ALLOWED = ['id', 'name', 'comment', 'customer', 'project'];
+    public const ACTIVITY_ORDER_ALLOWED = ['id', 'name', 'comment', 'customer', 'project', 'visible'];
 
     /**
      * @var Project[]|int[]
diff --git a/src/Repository/Query/CustomerQuery.php b/src/Repository/Query/CustomerQuery.php
index 91634065..a2f56747 100644
--- a/src/Repository/Query/CustomerQuery.php
+++ b/src/Repository/Query/CustomerQuery.php
@@ -16,7 +16,10 @@ class CustomerQuery extends BaseQuery implements VisibilityInterface
 {
     use VisibilityTrait;
 
-    public const CUSTOMER_ORDER_ALLOWED = ['id', 'name', 'comment', 'country', 'number'];
+    public const CUSTOMER_ORDER_ALLOWED = [
+        'id', 'name', 'comment', 'country', 'number', 'homepage', 'email', 'mobile', 'fax',
+        'phone', 'currency', 'address', 'contact', 'company', 'vatId', 'visible'
+    ];
 
     public function __construct()
     {
diff --git a/src/Repository/Query/ProjectQuery.php b/src/Repository/Query/ProjectQuery.php
index f2e7593d..44974c5b 100644
--- a/src/Repository/Query/ProjectQuery.php
+++ b/src/Repository/Query/ProjectQuery.php
@@ -18,7 +18,10 @@ class ProjectQuery extends BaseQuery implements VisibilityInterface
 {
     use VisibilityTrait;
 
-    public const PROJECT_ORDER_ALLOWED = ['id', 'name', 'comment', 'customer', 'orderNumber', 'projectStart', 'projectEnd'];
+    public const PROJECT_ORDER_ALLOWED = [
+        'id', 'name', 'comment', 'customer', 'orderNumber', 'projectStart',
+        'projectEnd', 'orderNumber', 'orderDate', 'start', 'end', 'visible'
+    ];
 
     /**
      * @var array
diff --git a/templates/activity/index.html.twig b/templates/activity/index.html.twig
index 34da1d45..8cbeb3e8 100644
--- a/templates/activity/index.html.twig
+++ b/templates/activity/index.html.twig
@@ -16,7 +16,7 @@
 {% endfor %}
 {% set columns = columns|merge({
     'team': {'class': 'text-center w-min', 'orderBy': false},
-    'visible': {'class': 'text-center hidden w-min', 'orderBy': false},
+    'visible': {'class': 'text-center hidden w-min'},
     'actions': {'class': 'actions alwaysVisible'},
 }) %}
 
diff --git a/templates/customer/index.html.twig b/templates/customer/index.html.twig
index 1960a863..135f8fb0 100644
--- a/templates/customer/index.html.twig
+++ b/templates/customer/index.html.twig
@@ -7,18 +7,18 @@
 {% set columns = {
     'name': {'class': 'alwaysVisible'},
     'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
-    'number': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'company': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'vat_id': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'contact': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'address': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'country': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'currency': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'phone': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'fax': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'mobile': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'email': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'homepage': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
+    'number': {'class': 'hidden-xs hidden-sm hidden'},
+    'company': {'class': 'hidden-xs hidden-sm hidden'},
+    'vat_id': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': 'vatId'},
+    'contact': {'class': 'hidden-xs hidden-sm hidden'},
+    'address': {'class': 'hidden-xs hidden-sm hidden'},
+    'country': {'class': 'hidden-xs hidden-sm hidden'},
+    'currency': {'class': 'hidden-xs hidden-sm hidden'},
+    'phone': {'class': 'hidden-xs hidden-sm hidden'},
+    'fax': {'class': 'hidden-xs hidden-sm hidden'},
+    'mobile': {'class': 'hidden-xs hidden-sm hidden'},
+    'email': {'class': 'hidden-xs hidden-sm hidden'},
+    'homepage': {'class': 'hidden-xs hidden-sm hidden'},
 } %}
 {% for field in metaColumns %}
     {% set columns = columns|merge({
@@ -27,7 +27,7 @@
 {% endfor %}
 {% set columns = columns|merge({
     'team': {'class': 'text-center w-min', 'orderBy': false},
-    'visible': {'class': 'text-center hidden w-min', 'orderBy': false},
+    'visible': {'class': 'text-center hidden w-min'},
     'actions': {'class': 'actions alwaysVisible'},
 }) %}
 
diff --git a/templates/project/index.html.twig b/templates/project/index.html.twig
index 53fef46f..7ed3aab4 100644
--- a/templates/project/index.html.twig
+++ b/templates/project/index.html.twig
@@ -8,10 +8,10 @@
     'name': {'class': 'alwaysVisible'},
     'customer': {'class': 'hidden-xs'},
     'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
-    'orderNumber': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'orderDate': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': false},
-    'start': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_start'|trans, 'orderBy': false},
-    'end': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_end'|trans, 'orderBy': false},
+    'orderNumber': {'class': 'hidden-xs hidden-sm hidden'},
+    'orderDate': {'class': 'hidden-xs hidden-sm hidden'},
+    'start': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_start'|trans},
+    'end': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_end'|trans},
 } %}
 {% for field in metaColumns %}
     {% set columns = columns|merge({
@@ -20,7 +20,7 @@
 {% endfor %}
 {% set columns = columns|merge({
     'team': {'class': 'text-center w-min', 'orderBy': false},
-    'visible': {'class': 'text-center hidden w-min', 'orderBy': false},
+    'visible': {'class': 'text-center hidden w-min'},
     'actions': {'class': 'actions alwaysVisible'},
 }) %}