diff --git a/src/Controller/CSPController.php b/src/Controller/CSPController.php
index 52ad627..79c7eb6 100644
--- a/src/Controller/CSPController.php
+++ b/src/Controller/CSPController.php
@@ -34,12 +34,14 @@ class CSPController extends AbstractController
             $searchQuery = $ticketsRepo->getByKeyword($searchKeywords);
             $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($searchQuery);
             $ticketsPerPage = count($paginator);
+            //If no tickets were found, return a special page.
+            //NOTE: we set page information to 1 of 1. Paginator has no tickets, which we're letting the twig template deal with.
+            return $this->render('cspViewer.html.twig',['tickets' => $paginator, 'portal' => $portal, 'pageNum' => 1, 'pageCount' => 1, 'form' => $form]);
         }
         else
         {
             $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($query);
         }
-
         //Pagination
         $totalItems = count($paginator);
         $pageCount = ceil($totalItems / $ticketsPerPage);
diff --git a/src/Repository/TicketRepository.php b/src/Repository/TicketRepository.php
index 366e1a5..cb797cf 100644
--- a/src/Repository/TicketRepository.php
+++ b/src/Repository/TicketRepository.php
@@ -49,6 +49,7 @@ class TicketRepository extends EntityRepository
         {
             $qb->andwhere('t.description LIKE :keyword'.$i)
             ->orwhere('t.summary LIKE :keyword'.$i)
+            ->orwhere('t.id LIKE :keyword'.$i)
             ->setParameter('keyword'.$i, '%'.$keyword.'%');
         }
         return $qb