diff --git a/src/widgetfactory.cpp b/src/widgetfactory.cpp
index a437a78..9746ef2 100644
--- a/src/widgetfactory.cpp
+++ b/src/widgetfactory.cpp
@@ -1,357 +1,371 @@
 /*
     Copyright (C) 2012-2014  Vishesh Handa <vhanda@kde.org>
 
     Code largely copied/adapted from KFileMetadataProvider
     Copyright (C) 2010 by Peter Penz <peter.penz@gmx.at>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
     version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
 #include "widgetfactory.h"
 #include "tagwidget.h"
 #include "kcommentwidget_p.h"
 #include "KRatingWidget"
 
 #include <KFileMetaData/UserMetaData>
 #include <KFileMetaData/PropertyInfo>
 
 #include <QLabel>
 #include <QCollator>
 #include <QTime>
 #include <QUrl>
 #include <QLocale>
 
 #include <KJob>
 #include <KFormat>
 #include <KLocalizedString>
 #include <KStringHandler>
 
 namespace {
     static QString plainText(const QString& richText)
     {
         QString plainText;
         plainText.reserve(richText.length());
 
         bool skip = false;
         for (int i = 0; i < richText.length(); ++i) {
             const QChar c = richText.at(i);
             if (c == QLatin1Char('<')) {
                 skip = true;
             } else if (c == QLatin1Char('>')) {
                 skip = false;
             } else if (!skip) {
                 plainText.append(c);
             }
         }
 
         return plainText;
     }
 }
 
 using namespace Baloo;
 
 WidgetFactory::WidgetFactory(QObject* parent)
     : QObject(parent)
     , m_readOnly( false )
     , m_noLinks( false )
     , m_dateFormat(QLocale::LongFormat)
 {
 }
 
 WidgetFactory::~WidgetFactory()
 {
 }
 
 //
 // Widget Creation
 //
-static QString toString(const QVariant& value)
+static QString formatDateTime(const QVariant& value, QLocale::FormatType dateFormat)
+{
+    const QString valueString = value.toString();
+    QDateTime dt = QDateTime::fromString(valueString, Qt::ISODate);
+
+    if (dt.isValid()) {
+        KFormat form;
+        QTime time = dt.time();
+        // Check if Date/DateTime
+        if (!time.hour() && !time.minute() && !time.second()){
+            return form.formatRelativeDate(dt.date(), dateFormat);
+        } else {
+            return form.formatRelativeDateTime(dt, dateFormat);
+        }
+    }
+
+    return valueString;
+}
+
+static QString toString(const QVariant& value, QLocale::FormatType dateFormat)
 {
     switch (value.type()) {
         case QVariant::Int:
             return QLocale().toString(value.toInt());
         case QVariant::Double:
             return QLocale().toString(value.toDouble());
         case QVariant::StringList:
             return value.toStringList().join(i18nc("String list separator", ", "));
+        case QVariant::Date:
+        case QVariant::DateTime: {
+            return formatDateTime(value, dateFormat);
+        }
         case QVariant::List: {
             QStringList list;
             for (const QVariant& var : value.toList()) {
-                list << toString(var);
+                list << toString(var, dateFormat);
             }
-
             return list.join(i18nc("String list separator", ", "));
         }
 
         default:
             return value.toString();
     }
 }
 
 QWidget* WidgetFactory::createWidget(const QString& prop, const QVariant& value, QWidget* parent)
 {
     QWidget* widget = nullptr;
     const int maxUrlLength = 80;
 
     if (prop == QLatin1String("rating")) {
         widget = createRatingWidget( value.toInt(), parent );
     }
     else if (prop == QLatin1String("userComment")) {
         widget = createCommentWidget( value.toString(), parent );
     }
     else if (prop == QLatin1String("tags")) {
         QStringList tags = value.toStringList();
         QCollator coll;
         coll.setNumericMode(true);
         std::sort(tags.begin(), tags.end(), [&](const QString& s1, const QString& s2){ return coll.compare(s1, s2) < 0; });
         widget = createTagWidget( tags, parent );
     }
     else {
         QString valueString;
         auto pi = KFileMetaData::PropertyInfo::fromName(prop);
         if (pi.name() == QLatin1String("originUrl")) {
-            //Won't make sense to shrink originUrl with noLinks, 
+            //Won't make sense to shrink originUrl with noLinks,
             //since it would make original URL unobtainable
             valueString = value.toString();
             if (!m_noLinks) {
-                //Shrink link name. 
+                //Shrink link name.
                 auto labelString = valueString;
                 if (labelString.size() > maxUrlLength) {
                     labelString = KStringHandler::csqueeze(labelString, maxUrlLength);
                 }
                 valueString = QStringLiteral("<a href=\"%1\">%2</a>").arg(valueString, labelString);
             }
         } else if (pi.name() != QLatin1String("empty")) {
-            valueString = pi.formatAsDisplayString(value);
-        } else {
-            // Check if Date/DateTime
-            QDateTime dt = QDateTime::fromString(value.toString(), Qt::ISODate);
-            if (dt.isValid()) {
-                KFormat form;
-                QTime time = dt.time();
-                if (!time.hour() && !time.minute() && !time.second()){
-                    valueString = form.formatRelativeDate(dt.date(), m_dateFormat);
-                } else {
-                    valueString = form.formatRelativeDateTime(dt, m_dateFormat);
-                }
-            }
-            else {
-                valueString = toString(value);
+            if (pi.valueType() == QVariant::DateTime || pi.valueType() == QVariant::Date) {
+                valueString = formatDateTime(value, m_dateFormat);
+            } else {
+                valueString = pi.formatAsDisplayString(value);
             }
+        } else {
+            valueString = toString(value, m_dateFormat);
         }
+
         widget = createValueWidget(valueString, parent);
     }
 
     widget->setForegroundRole(parent->foregroundRole());
     widget->setFont(parent->font());
     widget->setObjectName(prop);
     return widget;
 }
 
 QWidget* WidgetFactory::createTagWidget(const QStringList& tags, QWidget* parent)
 {
     TagWidget* tagWidget = new TagWidget(parent);
     tagWidget->setReadyOnly(m_readOnly);
     tagWidget->setSelectedTags(tags);
 
     connect(tagWidget, &TagWidget::selectionChanged, this, &WidgetFactory::slotTagsChanged);
     connect(tagWidget, &TagWidget::tagClicked, this, &WidgetFactory::slotTagClicked);
 
     m_tagWidget = tagWidget;
     m_prevTags = tags;
 
     return tagWidget;
 }
 
 QWidget* WidgetFactory::createCommentWidget(const QString& comment, QWidget* parent)
 {
     KCommentWidget* commentWidget = new KCommentWidget(parent);
     commentWidget->setText(comment);
     commentWidget->setReadOnly(m_readOnly);
 
     connect(commentWidget, &KCommentWidget::commentChanged, this, &WidgetFactory::slotCommentChanged);
 
     m_commentWidget = commentWidget;
 
     return commentWidget;
 }
 
 QWidget* WidgetFactory::createRatingWidget(int rating, QWidget* parent)
 {
     KRatingWidget* ratingWidget = new KRatingWidget(parent);
     const Qt::Alignment align = (ratingWidget->layoutDirection() == Qt::LeftToRight) ?
                                 Qt::AlignLeft : Qt::AlignRight;
     ratingWidget->setAlignment(align);
     ratingWidget->setRating(rating);
     const QFontMetrics metrics(parent->font());
     ratingWidget->setPixmapSize(metrics.height());
 
     connect(ratingWidget, static_cast<void (KRatingWidget::*)(uint)>(&KRatingWidget::ratingChanged), this, &WidgetFactory::slotRatingChanged);
 
     m_ratingWidget = ratingWidget;
 
     return ratingWidget;
 }
 
 
 // The default size hint of QLabel tries to return a square size.
 // This does not work well in combination with layouts that use
 // heightForWidth(): In this case it is possible that the content
 // of a label might get clipped. By specifying a size hint
 // with a maximum width that is necessary to contain the whole text,
 // using heightForWidth() assures having a non-clipped text.
 class ValueWidget : public QLabel
 {
 public:
     explicit ValueWidget(QWidget* parent = nullptr);
     QSize sizeHint() const override;
 };
 
 ValueWidget::ValueWidget(QWidget* parent) :
     QLabel(parent)
 {
 }
 
 QSize ValueWidget::sizeHint() const
 {
     QFontMetrics metrics(font());
     // TODO: QLabel internally provides already a method sizeForWidth(),
     // that would be sufficient. However this method is not accessible, so
     // as workaround the tags from a richtext are removed manually here to
     // have a proper size hint.
     return metrics.size(Qt::TextSingleLine, plainText(text()));
 }
 
 QWidget* WidgetFactory::createValueWidget(const QString& value, QWidget* parent)
 {
     ValueWidget* valueWidget = new ValueWidget(parent);
     valueWidget->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
     valueWidget->setWordWrap(true);
     valueWidget->setAlignment(Qt::AlignTop | Qt::AlignLeft);
     valueWidget->setText(m_readOnly ? plainText(value) : value);
     connect(valueWidget, &ValueWidget::linkActivated, this, &WidgetFactory::slotLinkActivated);
 
     return valueWidget;
 }
 
 //
 // Data Synchronization
 //
 
 void WidgetFactory::slotCommentChanged(const QString& comment)
 {
     for (const KFileItem& item : qAsConst(m_items)) {
         QUrl url = item.targetUrl();
         if (!url.isLocalFile()) {
             continue;
         }
         KFileMetaData::UserMetaData md(url.toLocalFile());
         md.setUserComment(comment);
     }
     emit dataChangeStarted();
     emit dataChangeFinished();
 }
 
 void WidgetFactory::slotRatingChanged(uint rating)
 {
     for (const KFileItem& item : qAsConst(m_items)) {
         QUrl url = item.targetUrl();
         if (!url.isLocalFile()) {
             continue;
         }
         KFileMetaData::UserMetaData md(url.toLocalFile());
         md.setRating(rating);
     }
     emit dataChangeStarted();
     emit dataChangeFinished();
 }
 
 void WidgetFactory::slotTagsChanged(const QStringList& tags)
 {
     if (m_tagWidget) {
         for (const KFileItem& item : qAsConst(m_items)) {
             QUrl url = item.targetUrl();
             if (!url.isLocalFile()) {
                 continue;
             }
             KFileMetaData::UserMetaData md(url.toLocalFile());
 
             // When multiple tags are selected one doesn't want to loose the old tags
             // of any of the resources. Unless specifically removed.
             QStringList newTags = md.tags() + tags;
             newTags.removeDuplicates();
 
             for (const QString& tag : m_prevTags) {
                 if (!tags.contains(tag)) {
                     newTags.removeAll(tag);
                 }
             }
             md.setTags(newTags);
         }
 
         m_prevTags = tags;
         emit dataChangeStarted();
         emit dataChangeFinished();
     }
 }
 
 //
 // Notifications
 //
 
 void WidgetFactory::slotLinkActivated(const QString& url)
 {
     emit urlActivated(QUrl::fromUserInput(url));
 }
 
 void WidgetFactory::slotTagClicked(const QString& tag)
 {
     QUrl url;
     url.setScheme(QStringLiteral("tags"));
     url.setPath(tag);
 
     emit urlActivated(url);
 }
 
 
 //
 // Accessor Methods
 //
 void WidgetFactory::setReadOnly(bool value)
 {
     m_readOnly = value;
 }
 
 void WidgetFactory::setNoLinks(bool value)
 {
     m_noLinks = value;
 }
 
 void WidgetFactory::setItems(const KFileItemList& items)
 {
     m_items = items;
 }
 
 Baloo::DateFormats WidgetFactory::dateFormat() const
 {
     return static_cast<Baloo::DateFormats>(m_dateFormat);
 }
 
 void Baloo::WidgetFactory::setDateFormat(const Baloo::DateFormats format)
 {
     m_dateFormat = static_cast<QLocale::FormatType>(format);
 }