diff --git a/src/handlers/survey.lisp b/src/handlers/survey.lisp
index 5981478..80f8480 100644
--- a/src/handlers/survey.lisp
+++ b/src/handlers/survey.lisp
@@ -34,14 +34,14 @@
              (case action
                (id (second (split-uri uri)))
                (id-p (let ((ids (mapcar #'car (load-response (make-surveys-db-path)))))
-                       (if (member (survey-fn 'id) ids) t nil)))
+                       (if (member (parse-integer (survey-fn 'id)) ids) t nil)))
                (uri-p (let ((parts (split-uri uri)))
                         (and (= (length parts) 2)
                              (string= (first parts) "survey")
                              (every #'digit-char-p (second parts))
                              (survey-fn 'id-p))))
-               (properties (let ((survey-id (parse-integer (survey-fn 'id))))
-                             (first (rest (assoc survey-id (load-response (make-surveys-db-path))))))))))
+               (properties (first (rest (assoc (parse-integer (survey-fn 'id))
+                                               (load-response (make-surveys-db-path)))))))))
     #'survey-fn))
 
 (define-easy-handler (survey :uri #'survey-uri) ()