diff --git a/.jscsrc b/.jscsrc
index 70d8d4b..a98c9da 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -27,7 +27,7 @@
   "disallowSpacesInsideArrayBrackets": true,
   "disallowSpacesInsideParentheses": true,
   "disallowTrailingComma": true,
-  "disallowTrailingWhitespace": true,
+  "disallowTrailingWhitespace": false,
   "requireCommaBeforeLineBreak": true,
   "requireLineFeedAtFileEnd": true,
   "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],
diff --git a/server/components/orm/selectQuery.js b/server/components/orm/selectQuery.js
index 979e584..29b4615 100644
--- a/server/components/orm/selectQuery.js
+++ b/server/components/orm/selectQuery.js
@@ -18,6 +18,8 @@ export default function (parameters) {
 
   let groupBy = params['groupBy:'];
 
+  let onlyCountQuery = false;
+
   function parseOrderByParams(params) {
 
     let arr = params.split(',');
@@ -192,7 +194,10 @@ export default function (parameters) {
       groupBy = groupByList.join(', ');
       orderBy = groupBy;
 
-      result.query = `SELECT ${selectGrouped.join(', ')}, count(*) as [count()] `;
+      if (selectGrouped.length === 0) onlyCountQuery = true;
+      selectGrouped.push('count(*) as [count()]');
+
+      result.query = `SELECT ${selectGrouped.join(', ')}`;
 
       _.each(cnfg.fields, (field, name) => {
 
@@ -442,7 +447,7 @@ export default function (parameters) {
       result.query += ` GROUP BY ${groupBy} `
     }
 
-    if (!params['agg:']) {
+    if (!params['agg:'] && !onlyCountQuery) {
       if (orderBy) {
         result.query += ` ORDER BY ${orderBy}`;
       } else {