diff --git a/packages/analytics/src/models/commands.js b/packages/analytics/src/models/commands.js
index 2ea16de..3abd2b0 100644
--- a/packages/analytics/src/models/commands.js
+++ b/packages/analytics/src/models/commands.js
@@ -2,25 +2,26 @@ import { Command } from '@linux-odyssey/models'
 
 // eslint-disable-next-line import/prefer-default-export
 export async function errorCommands() {
-  const commands = await Command.find({ error: { $ne: '' } })
+  const commands = await Command.find({
+    $and: [
+      { error: { $exists: true } },
+      { error: { $ne: null } },
+      { error: { $ne: '' } },
+    ],
+  })
     .populate({
       path: 'session',
-      populate: [
-        {
-          path: 'user',
-        },
-        { path: 'quest' },
-      ],
+      populate: { path: 'user' },
     })
     .exec()
   return commands.map(({ command, error, createdAt, session }) => {
     const { user, quest } = session
     return {
-      command,
-      error,
-      createdAt: createdAt.toLocaleString(),
-      user: user.username,
-      quest: quest.id,
+      command: command.slice(0, 20),
+      error: error.slice(0, 50),
+      createdAt: createdAt?.toLocaleString(),
+      user: user?.username,
+      quest,
     }
   })
 }