diff --git a/zvelo_api.pb.go b/zvelo_api.pb.go
index 315105b..9075745 100644
--- a/zvelo_api.pb.go
+++ b/zvelo_api.pb.go
@@ -169,14 +169,8 @@ func (m *QueryContentRequests_URLContent) GetContent() string {
 }
 
 type QueryReply struct {
-	Status     *Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
-	RequestId  string  `protobuf:"bytes,2,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
-	Url        string  `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"`
-	TrackingId string  `protobuf:"bytes,4,opt,name=tracking_id,json=trackingId" json:"tracking_id,omitempty"`
-	// the target of QueryStatus, to ensure that the QueryStatus call
-	// goes to the same cluster as the original call.
-	// Will only be set if user set p=true in request.
-	StatusUrl string `protobuf:"bytes,5,opt,name=status_url,json=statusUrl" json:"status_url,omitempty"`
+	Status    *Status `protobuf:"bytes,1,opt,name=status" json:"status,omitempty"`
+	RequestId string  `protobuf:"bytes,2,opt,name=request_id,json=requestId" json:"request_id,omitempty"`
 }
 
 func (m *QueryReply) Reset()                    { *m = QueryReply{} }
@@ -198,30 +192,11 @@ func (m *QueryReply) GetRequestId() string {
 	return ""
 }
 
-func (m *QueryReply) GetUrl() string {
-	if m != nil {
-		return m.Url
-	}
-	return ""
-}
-
-func (m *QueryReply) GetTrackingId() string {
-	if m != nil {
-		return m.TrackingId
-	}
-	return ""
-}
-
-func (m *QueryReply) GetStatusUrl() string {
-	if m != nil {
-		return m.StatusUrl
-	}
-	return ""
-}
-
 // If a request contained more then one URL, or piece of content, we will reply
 // with this reply. Each sub-query should be reflected in the replies field,
-// and with their own status.
+// and with their own status. The position in the array will correspond to the
+// index in the original array of URL or Content provided in the QueryURLRequests
+// or QueryContentRequests message
 type QueryReplies struct {
 	Replies []*QueryReply `protobuf:"bytes,1,rep,name=replies" json:"replies,omitempty"`
 	Status  *Status       `protobuf:"bytes,2,opt,name=status" json:"status,omitempty"`
@@ -257,35 +232,33 @@ func init() {
 func init() { proto.RegisterFile("zvelo/msg/zvelo_api.proto", fileDescriptor6) }
 
 var fileDescriptor6 = []byte{
-	// 475 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x53, 0xdd, 0x8a, 0xd3, 0x40,
-	0x14, 0x26, 0x49, 0x9b, 0x6e, 0x4f, 0x97, 0xba, 0x0e, 0x6b, 0x1d, 0x03, 0x62, 0xe9, 0x8d, 0xd5,
-	0x8b, 0x54, 0x2a, 0x88, 0x7a, 0xa9, 0x2b, 0xb8, 0xb0, 0x08, 0xce, 0xda, 0x1b, 0x6f, 0xca, 0x6c,
-	0x32, 0xd4, 0xd8, 0xd9, 0x26, 0xce, 0x4c, 0x16, 0xe2, 0x13, 0xf9, 0x26, 0x3e, 0x80, 0xf8, 0x3e,
-	0x92, 0x33, 0x93, 0x1f, 0x44, 0xd0, 0x5b, 0xef, 0xce, 0xf9, 0xce, 0xcf, 0x7c, 0xdf, 0x37, 0x33,
-	0x70, 0xef, 0xeb, 0x8d, 0x90, 0xf9, 0xea, 0x5a, 0xef, 0x56, 0x18, 0x6d, 0x79, 0x91, 0xc5, 0x85,
-	0xca, 0x4d, 0x4e, 0xc6, 0x08, 0xc4, 0xd7, 0x7a, 0x17, 0xdd, 0xed, 0xba, 0x52, 0x6e, 0xb8, 0x16,
-	0xc6, 0xf6, 0x44, 0xb3, 0xae, 0xa0, 0x0d, 0x37, 0xa5, 0xb6, 0xf8, 0xe2, 0xbb, 0x07, 0x27, 0xef,
-	0x4b, 0xa1, 0xaa, 0x0d, 0xbb, 0x60, 0xe2, 0x4b, 0x29, 0xb4, 0xd1, 0xe4, 0x04, 0x82, 0x52, 0x49,
-	0xea, 0xcd, 0x83, 0xe5, 0x98, 0xd5, 0x21, 0x79, 0x02, 0x23, 0xb7, 0x8f, 0xfa, 0xf3, 0x60, 0x39,
-	0x5d, 0xcf, 0xe2, 0xf6, 0xd0, 0xf8, 0x8c, 0x1b, 0x7e, 0x29, 0xcc, 0x87, 0xaa, 0x10, 0xac, 0x69,
-	0x23, 0x11, 0x1c, 0x25, 0x5c, 0xca, 0x2b, 0x9e, 0xec, 0x69, 0x30, 0xf7, 0x96, 0x63, 0xd6, 0xe6,
-	0x84, 0xc0, 0xa0, 0xc8, 0xa5, 0xa4, 0x83, 0xb9, 0xb7, 0x3c, 0x62, 0x18, 0x93, 0x87, 0x70, 0xab,
-	0xe0, 0xca, 0x64, 0x5c, 0x6e, 0x95, 0xd0, 0xa5, 0x34, 0x9a, 0x0e, 0xb1, 0x3c, 0x75, 0x30, 0xb3,
-	0x28, 0x99, 0x41, 0xc8, 0x93, 0x44, 0x14, 0x86, 0x86, 0xb8, 0xd6, 0x65, 0x8b, 0x9f, 0x01, 0x9c,
-	0xa2, 0x92, 0xd7, 0xf9, 0xc1, 0x88, 0x83, 0x69, 0xd5, 0x9c, 0xc1, 0x28, 0xb1, 0x10, 0x2a, 0x9a,
-	0xac, 0x1f, 0xf7, 0xb8, 0xff, 0x69, 0x22, 0xde, 0xb0, 0x8b, 0x06, 0x6a, 0x46, 0xff, 0x03, 0x07,
-	0xa2, 0x1f, 0x1e, 0x40, 0x47, 0x9d, 0x4c, 0xc1, 0xcf, 0x52, 0xea, 0x61, 0x8b, 0x9f, 0xa5, 0xcd,
-	0xad, 0xfa, 0x08, 0xe0, 0xad, 0xbe, 0x83, 0xf0, 0x93, 0xe0, 0xa9, 0x50, 0x34, 0x40, 0x63, 0x9e,
-	0xfd, 0xbb, 0x31, 0xf1, 0x5b, 0x1c, 0x7c, 0x73, 0x30, 0xaa, 0x62, 0x6e, 0x0b, 0xa1, 0x9d, 0xd3,
-	0x03, 0x3c, 0xa5, 0x49, 0xa3, 0x17, 0x30, 0xe9, 0x0d, 0xd4, 0x54, 0xf6, 0xa2, 0x72, 0xdc, 0xea,
-	0x90, 0x9c, 0xc2, 0xf0, 0x86, 0xcb, 0x52, 0x38, 0x7a, 0x36, 0x79, 0xe9, 0x3f, 0xf7, 0x16, 0xdf,
-	0x3c, 0x00, 0x24, 0xc3, 0x44, 0x21, 0x2b, 0xf2, 0x08, 0x42, 0xfb, 0x80, 0x71, 0x7a, 0xb2, 0xbe,
-	0xdd, 0xe3, 0x7c, 0x89, 0x05, 0xe6, 0x1a, 0xc8, 0x7d, 0x00, 0x65, 0x99, 0x6f, 0xb3, 0xd4, 0x2d,
-	0x1e, 0x3b, 0xe4, 0xbc, 0xf5, 0x23, 0xe8, 0xfc, 0x78, 0x00, 0x13, 0xa3, 0x78, 0xb2, 0xcf, 0x0e,
-	0xbb, 0x7a, 0xc2, 0x6a, 0x80, 0x06, 0x3a, 0x4f, 0xeb, 0x8d, 0x76, 0xf7, 0xb6, 0x9e, 0x1c, 0xda,
-	0x8d, 0x16, 0xd9, 0x28, 0xb9, 0xf8, 0x0c, 0xc7, 0x2d, 0xd3, 0x4c, 0x68, 0xb2, 0x82, 0x91, 0xb2,
-	0xa1, 0x7b, 0x79, 0x77, 0x7e, 0x37, 0x18, 0x35, 0xb1, 0xa6, 0xab, 0x27, 0xce, 0xff, 0x8b, 0xb8,
-	0x57, 0xd3, 0x8f, 0xc7, 0xb6, 0x96, 0xe1, 0xaf, 0xbe, 0x0a, 0xf1, 0x3f, 0x3f, 0xfd, 0x15, 0x00,
-	0x00, 0xff, 0xff, 0x62, 0x91, 0xf8, 0x68, 0x28, 0x04, 0x00, 0x00,
+	// 441 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x93, 0xdf, 0x8b, 0xd3, 0x40,
+	0x10, 0xc7, 0x49, 0xd2, 0x4b, 0xaf, 0xd3, 0xa3, 0x9e, 0xcb, 0x59, 0xd7, 0x80, 0x50, 0xfa, 0x62,
+	0xf5, 0x21, 0x95, 0x0a, 0xa2, 0x3e, 0xea, 0x09, 0x0a, 0x87, 0xe0, 0x9e, 0xe7, 0x83, 0x2f, 0x65,
+	0x2f, 0x19, 0xce, 0x78, 0x7b, 0x4d, 0xdc, 0xdd, 0x14, 0xe2, 0x3f, 0xe8, 0x1f, 0x20, 0xfe, 0x3f,
+	0xd2, 0xd9, 0x4d, 0x13, 0x44, 0xd0, 0x57, 0xdf, 0x66, 0xbe, 0xf3, 0x63, 0x3f, 0x33, 0xbb, 0x0b,
+	0xf7, 0xbe, 0x6d, 0x51, 0x95, 0xcb, 0x1b, 0x73, 0xb5, 0x24, 0x6b, 0x2d, 0xab, 0x22, 0xad, 0x74,
+	0x69, 0x4b, 0x36, 0x22, 0x21, 0xbd, 0x31, 0x57, 0xc9, 0xdd, 0x2e, 0x2b, 0x97, 0x56, 0x1a, 0xb4,
+	0x2e, 0x27, 0x99, 0x76, 0x01, 0x63, 0xa5, 0xad, 0x8d, 0xd3, 0xe7, 0xdf, 0x03, 0x38, 0x7e, 0x5f,
+	0xa3, 0x6e, 0x2e, 0xc4, 0x99, 0xc0, 0xaf, 0x35, 0x1a, 0x6b, 0xd8, 0x31, 0x44, 0xb5, 0x56, 0x3c,
+	0x98, 0x45, 0x8b, 0x91, 0xd8, 0x99, 0xec, 0x31, 0x0c, 0x7d, 0x3f, 0x1e, 0xce, 0xa2, 0xc5, 0x64,
+	0x35, 0x4d, 0xf7, 0x87, 0xa6, 0xa7, 0xd2, 0xca, 0x73, 0xb4, 0x1f, 0x9a, 0x0a, 0x45, 0x9b, 0xc6,
+	0x12, 0x38, 0xcc, 0xa4, 0x52, 0x97, 0x32, 0xbb, 0xe6, 0xd1, 0x2c, 0x58, 0x8c, 0xc4, 0xde, 0x67,
+	0x0c, 0x06, 0x55, 0xa9, 0x14, 0x1f, 0xcc, 0x82, 0xc5, 0xa1, 0x20, 0x9b, 0x3d, 0x80, 0x5b, 0x95,
+	0xd4, 0xb6, 0x90, 0x6a, 0xad, 0xd1, 0xd4, 0xca, 0x1a, 0x7e, 0x40, 0xe1, 0x89, 0x97, 0x85, 0x53,
+	0xd9, 0x14, 0x62, 0x99, 0x65, 0x58, 0x59, 0x1e, 0x53, 0x5b, 0xef, 0xcd, 0x7f, 0x46, 0x70, 0x42,
+	0x93, 0xbc, 0x2a, 0x37, 0x16, 0x37, 0x76, 0x3f, 0xcd, 0x29, 0x0c, 0x33, 0x27, 0xd1, 0x44, 0xe3,
+	0xd5, 0xa3, 0x1e, 0xfb, 0x9f, 0x2a, 0xd2, 0x0b, 0x71, 0xd6, 0x4a, 0x6d, 0xe9, 0x7f, 0xb0, 0x81,
+	0xe4, 0x47, 0x00, 0xd0, 0xa1, 0xb3, 0x09, 0x84, 0x45, 0xce, 0x03, 0x4a, 0x09, 0x8b, 0xbc, 0xbd,
+	0xd5, 0x90, 0x04, 0xba, 0xd5, 0x77, 0x10, 0x7f, 0x46, 0x99, 0xa3, 0xe6, 0x11, 0x2d, 0xe6, 0xe9,
+	0xbf, 0x2f, 0x26, 0x7d, 0x43, 0x85, 0xaf, 0x37, 0x56, 0x37, 0xc2, 0x77, 0x61, 0xbc, 0xdb, 0xf4,
+	0x80, 0x4e, 0x69, 0xdd, 0xe4, 0x39, 0x8c, 0x7b, 0x05, 0x3b, 0x94, 0x6b, 0x6c, 0x3c, 0xdb, 0xce,
+	0x64, 0x27, 0x70, 0xb0, 0x95, 0xaa, 0x46, 0x8f, 0xe7, 0x9c, 0x17, 0xe1, 0xb3, 0x60, 0xfe, 0x11,
+	0x80, 0x58, 0x04, 0x56, 0xaa, 0x61, 0x0f, 0x21, 0x76, 0xef, 0x97, 0x8a, 0xc7, 0xab, 0xdb, 0x3d,
+	0xe4, 0x73, 0x0a, 0x08, 0x9f, 0xc0, 0xee, 0x03, 0x68, 0x07, 0xbe, 0x2e, 0x72, 0xdf, 0x77, 0xe4,
+	0x95, 0xb7, 0xf9, 0xfc, 0x0b, 0x1c, 0xed, 0xfb, 0x16, 0x68, 0xd8, 0x12, 0x86, 0xda, 0x99, 0xfe,
+	0x99, 0xdc, 0xf9, 0x7d, 0x1b, 0x44, 0x20, 0xda, 0xac, 0x1e, 0x4a, 0xf8, 0x17, 0x94, 0x97, 0x93,
+	0x4f, 0x47, 0x2e, 0x56, 0xd0, 0x17, 0xbc, 0x8c, 0xe9, 0xf3, 0x3d, 0xf9, 0x15, 0x00, 0x00, 0xff,
+	0xff, 0xea, 0x91, 0xe0, 0x15, 0xd5, 0x03, 0x00, 0x00,
 }
diff --git a/zvelo_api.proto b/zvelo_api.proto
index 596298c..541faa5 100644
--- a/zvelo_api.proto
+++ b/zvelo_api.proto
@@ -36,17 +36,13 @@ message QueryContentRequests {
 message QueryReply {
   Status status              = 1; // The zvelo internal status.
   string request_id          = 2; // The request_ids will identify the request after submission
-  string url                 = 3; // If the original request was a URL request, this will be populated
-  string tracking_id         = 4; // If the original request was a Content request, this will be populated
-  // the target of QueryStatus, to ensure that the QueryStatus call
-  // goes to the same cluster as the original call.
-  // Will only be set if user set p=true in request.
-  string status_url          = 5;
 }
 
 // If a request contained more then one URL, or piece of content, we will reply
 // with this reply. Each sub-query should be reflected in the replies field,
-// and with their own status.
+// and with their own status. The position in the array will correspond to the
+// index in the original array of URL or Content provided in the QueryURLRequests
+// or QueryContentRequests message
 message QueryReplies {
     repeated QueryReply replies = 1;  // this contains a reply for each sub query
     Status status = 2; // this reflects the overall status of the sub-queries