diff --git a/app/handler/file.go b/app/handler/file.go
index 0d661dc..5374cc9 100644
--- a/app/handler/file.go
+++ b/app/handler/file.go
@@ -21,11 +21,11 @@ func (hand *Handler) FileExists(rctx *router.Context) {
 		rctx.SetStatus(code)
 		return
 	}
-	rctx.SetHeader("Content-Type", res.ContentType)
-	rctx.SetHeader("Content-Size", res.ContentSize)
-	rctx.SetHeader("Content-Digest", res.ContentDigest)
+	rctx.SetHeader("X-Content-Type", res.ContentType)
+	rctx.SetHeader("X-Content-Size", res.ContentSize)
+	rctx.SetHeader("X-Content-Digest", res.ContentDigest)
+	rctx.SetHeader("Content-Length", "0")
 	rctx.SetStatus(code)
-
 }
 
 func (hand *Handler) PutFile(rctx *router.Context) {
@@ -67,10 +67,11 @@ func (hand *Handler) GetFile(rctx *router.Context) {
 		rctx.SetStatus(code)
 		return
 	}
-	rctx.SetStatus(code)
+
 	rctx.SetHeader("Content-Type", res.ContentType)
-	rctx.SetHeader("Content-Size", res.ContentSize)
+	rctx.SetHeader("Content-Length", res.ContentSize)
 	rctx.SetHeader("Content-Digest", res.ContentDigest)
+	rctx.SetStatus(code)
 
 	if res.Source != nil {
 		defer res.Source.Close()
diff --git a/test/file_test.go b/test/file_test.go
index b1c4fc8..f3179dc 100644
--- a/test/file_test.go
+++ b/test/file_test.go
@@ -23,7 +23,7 @@ func TestFileOperations(t *testing.T) {
 	srv, err := server.NewServer()
 	require.NoError(t, err)
 
-	filename := `bare.bin`
+	filename := `bare.bin?abc=12`
 
 	{
 		err = srv.Configure()