diff --git a/storage/tracking.lisp b/storage/tracking.lisp
index 8555964..9100635 100644
--- a/storage/tracking.lisp
+++ b/storage/tracking.lisp
@@ -5,7 +5,7 @@
 (defpackage :scopes/storage/tracking
   (:use :common-lisp)
   (:local-nicknames (:storage :scopes/storage))
-  (:export #:track #:head #:time-stamp #:data #:proplist
+  (:export #:track #:head #:head-proplist #:time-stamp #:data
            #:container 
            #:make-item
            #:insert
@@ -23,7 +23,7 @@
 (defclass container ()
   ((item-factory :initform #'(lambda (cont head) 
                                (make-instance 'track :container cont :head head)))
-   (head-fields :reader head-fields :initform '(taskid username))
+   (head-fields :reader head-fields :initform '(:taskid :username))
    (table-name :reader table-name :initform :tracks)
    (indexes :reader indexes :initform '((taskid username) (username)))
    (storage :reader storage :initarg :storage)))
diff --git a/test/test-storage.lisp b/test/test-storage.lisp
index 57198bc..82e66f4 100644
--- a/test/test-storage.lisp
+++ b/test/test-storage.lisp
@@ -38,10 +38,13 @@
     (t:show-result)))
 
 (defun test-track (st)
-  (let* ((cont (make-instance 'tracking:container :storage st))
-         (tr (tracking:make-item cont "t01" "john")))
+  (let (cont tr)
+    (setf cont (make-instance 'tracking:container :storage st))
     (storage:drop-table st :testing.tracks)
     (tracking:create-table cont)
-    (tracking:insert tr)
+    (setf tr (tracking:make-item cont "t01" "john"))
     (== (tracking:head tr) '("t01" "john"))
-    (== (tracking:data tr) nil)))
+    (== (tracking:head-proplist tr) '(:username "john" :taskid "t01"))
+    (== (tracking:data tr) nil)
+    (tracking:insert tr)
+    ))