diff --git a/src/handlers/surveys.lisp b/src/handlers/surveys.lisp
index 4052ded..132c45e 100644
--- a/src/handlers/surveys.lisp
+++ b/src/handlers/surveys.lisp
@@ -1,9 +1,9 @@
 (in-package :ml-survey/handlers)
 
 (define-easy-handler (surveys :uri "/") nil
-  (ml-survey/views:surveys (mapcar (lambda (x)
-                                     (make-instance 'ml-survey:survey
-                                                    :id (format nil
-                                                                "~a"
-                                                                (first x))))
-                                   (load-response (make-surveys-db-file)))))
+  (let* ((survey-db (load-response (make-surveys-db-file)))
+         (list-of-surveys (mapcar (lambda (x)
+                                    (make-instance 'ml-survey:survey
+                                                   :id (format nil "~a" (first x))))
+                                  survey-db)))
+    (ml-survey/views:surveys list-of-surveys)))