diff --git a/services/hunt_dispatcher/hunt_dispatcher.go b/services/hunt_dispatcher/hunt_dispatcher.go
index 29456ba..2a399b0 100644
--- a/services/hunt_dispatcher/hunt_dispatcher.go
+++ b/services/hunt_dispatcher/hunt_dispatcher.go
@@ -130,10 +130,12 @@ func (self HuntDispatcher) SetHunt(hunt *api_proto.Hunt) error {
 	}
 
 	record := &HuntEntry{
-		HuntId:  hunt_id,
-		Hunt:    string(serialized),
-		State:   hunt.State.String(),
-		DocType: "hunts",
+		HuntId:    hunt_id,
+		Timestamp: int64(hunt.CreateTime / 1000000),
+		Expires:   hunt.Expires,
+		Hunt:      string(serialized),
+		State:     hunt.State.String(),
+		DocType:   "hunts",
 	}
 
 	if hunt.Stats != nil {