diff --git a/sdk/core/core.cpp b/sdk/core/core.cpp
index bcd5e35..fa6cf6d 100644
--- a/sdk/core/core.cpp
+++ b/sdk/core/core.cpp
@@ -116,7 +116,7 @@ struct AlgorithmCore
             return fileList; // Already enrolled
 
         const TemplateList i(TemplateList::fromInput(input));
-        if (i.isEmpty()) return FileList(); // Nothing to enroll
+        if (i.isEmpty()) return fileList; // Nothing to enroll
 
         if (transform.isNull()) qFatal("AlgorithmCore::enroll null transform.");
         const int blocks = Globals->blocks(i.size());
diff --git a/sdk/plugins/output.cpp b/sdk/plugins/output.cpp
index e2d0f33..4717d95 100644
--- a/sdk/plugins/output.cpp
+++ b/sdk/plugins/output.cpp
@@ -150,6 +150,7 @@ class rrOutput : public MatrixOutput
         const bool index = file.getBool("index");
         const bool score = file.getBool("score");
         const bool invert = file.getBool("invert");
+        const bool metadata = file.getBool("metadata");
         const float threshold = file.getFloat("threshold", -std::numeric_limits<float>::max());
 
         QStringList lines;
@@ -159,9 +160,17 @@ class rrOutput : public MatrixOutput
 
             typedef QPair<float,int> Pair;
             foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), !invert).mid(0, limit)) {
-                if (pair.second < threshold) break;
-                files.append((index ? QString::number(pair.second) : targetFiles[pair.second].name) +
-                             (score ? "=" + QString::number(pair.first) : ""));
+                if (pair.first < threshold) break;
+                QString output;
+                output.append((index ? QString::number(pair.second) : targetFiles[pair.second].name) +
+                              (score ? "=" + QString::number(pair.first) : ""));
+                if (metadata) {
+                    foreach (const QString &key, targetFiles[pair.second].localKeys()) {
+                        const QString value = targetFiles[pair.second].getString(key, "");
+                        output.append("," + key + "=" + value);
+                    }
+                }
+                files.append(output);
             }
             lines.append(files.join(flat ? "\n" : ","));
         }
diff --git a/share/openbr/doc b/share/openbr/doc
index d446cb3..504960d 160000
--- a/share/openbr/doc
+++ b/share/openbr/doc
@@ -1 +1 @@
-Subproject commit d446cb37c75632fb50af0c5c43bee55584b08107
+Subproject commit 504960df12db25e09c39ab098fb8614c1db51617
diff --git a/share/openbr/models b/share/openbr/models
index 5bfe098..a7a133b 160000
--- a/share/openbr/models
+++ b/share/openbr/models
@@ -1 +1 @@
-Subproject commit 5bfe0988716f6e7b926910d74f9696f002cdbfb6
+Subproject commit a7a133b98757d6affadd834b0d96d16e6d8ca04f