diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py
index b5356af16..c5ee613e2 100644
--- a/apps/assets/api/asset.py
+++ b/apps/assets/api/asset.py
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 #
 
-import random
-
-from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 from rest_framework.generics import RetrieveAPIView
 from django.shortcuts import get_object_or_404
diff --git a/apps/audits/api.py b/apps/audits/api.py
index c6c648f5c..162d50977 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -92,8 +92,8 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet):
     date_range_filter_fields = [
         ('date_start', ('date_from', 'date_to'))
     ]
-    filter_fields = ['user__name', 'command', 'run_as__name']
-    search_fields = ['command']
+    filter_fields = ['user__name', 'command', 'run_as__name', 'is_finished']
+    search_fields = ['command', 'user__name', 'run_as__name']
     ordering = ['-date_created']