--- a/OrthancServer/OrthancRestApi.cpp	Tue Oct 23 15:12:40 2012 +0200
+++ b/OrthancServer/OrthancRestApi.cpp	Tue Oct 23 15:43:46 2012 +0200
@@ -566,17 +566,19 @@
               uri[2] == "tags" || 
               uri[2] == "simplified-tags"))
     {
-      std::string fileUuid, contentType;
+      std::string fileUuid, contentType, filename;
       if (uri[2] == "file")
       {
         existingResource = index_.GetDicomFile(fileUuid, uri[1]);
         contentType = "application/dicom";
+        filename = fileUuid + ".dcm";
       }
       else if (uri[2] == "tags" ||
                uri[2] == "simplified-tags")
       {
         existingResource = index_.GetJsonFile(fileUuid, uri[1]);
         contentType = "application/json";
+        filename = fileUuid + ".json";
       }
 
       if (existingResource)
@@ -590,7 +592,7 @@
         }
         else
         {
-          output.AnswerFile(storage_, fileUuid, contentType);
+          output.AnswerFile(storage_, fileUuid, contentType, filename.c_str());
           return;
         }
       }