diff --git a/src/models/keylistsortfilterproxymodel.cpp b/src/models/keylistsortfilterproxymodel.cpp
index f0d6446..e2b079f 100644
--- a/src/models/keylistsortfilterproxymodel.cpp
+++ b/src/models/keylistsortfilterproxymodel.cpp
@@ -1,223 +1,222 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     models/keylistsortfilterproxymodel.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     Copyright (c) 2007 Klarälvdalens Datakonsult AB
 
     Kleopatra is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     Kleopatra 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
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
     the Qt library by Trolltech AS, Norway (or with modified versions
     of Qt that use the same license as Qt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
     Qt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 #include "keylistsortfilterproxymodel.h"
 
 #include "keylistmodel.h"
 #include "kleo/keyfilter.h"
 #include "kleo/stl_util.h"
 
 #include <libkleo_debug.h>
 
 #include <gpgme++/key.h>
 
 
 using namespace Kleo;
 using namespace GpgME;
 
 AbstractKeyListSortFilterProxyModel::AbstractKeyListSortFilterProxyModel(QObject *p)
     : QSortFilterProxyModel(p), KeyListModelInterface()
 {
     init();
 }
 
 AbstractKeyListSortFilterProxyModel::AbstractKeyListSortFilterProxyModel(const AbstractKeyListSortFilterProxyModel &other)
     : QSortFilterProxyModel(), KeyListModelInterface()
 {
     Q_UNUSED(other);
     init();
 }
 
 void AbstractKeyListSortFilterProxyModel::init()
 {
     setDynamicSortFilter(true);
     setSortRole(Qt::EditRole);    // EditRole can be expected to be in a less formatted way, better for sorting
     setFilterRole(Qt::DisplayRole);
     setFilterCaseSensitivity(Qt::CaseInsensitive);
 }
 
 AbstractKeyListSortFilterProxyModel::~AbstractKeyListSortFilterProxyModel() {}
 
 Key AbstractKeyListSortFilterProxyModel::key(const QModelIndex &idx) const
 {
     const KeyListModelInterface *const klmi = dynamic_cast<KeyListModelInterface *>(sourceModel());
     if (!klmi) {
         static Key null;
         return null;
     }
     return klmi->key(mapToSource(idx));
 }
 
 std::vector<Key> AbstractKeyListSortFilterProxyModel::keys(const QList<QModelIndex> &indexes) const
 {
     const KeyListModelInterface *const klmi = dynamic_cast<KeyListModelInterface *>(sourceModel());
     if (!klmi) {
         return std::vector<Key>();
     }
     QList<QModelIndex> mapped;
     mapped.reserve(indexes.size());
     std::transform(indexes.begin(), indexes.end(),
                    std::back_inserter(mapped),
                    [this](const QModelIndex &idx) {
                        return mapToSource(idx);
                    });
     return klmi->keys(mapped);
 }
 
 QModelIndex AbstractKeyListSortFilterProxyModel::index(const Key &key) const
 {
     if (const KeyListModelInterface *const klmi = dynamic_cast<KeyListModelInterface *>(sourceModel())) {
         return mapFromSource(klmi->index(key));
     } else {
         return QModelIndex();
     }
 }
 
 QList<QModelIndex> AbstractKeyListSortFilterProxyModel::indexes(const std::vector<Key> &keys) const
 {
     if (const KeyListModelInterface *const klmi = dynamic_cast<KeyListModelInterface *>(sourceModel())) {
         const QList<QModelIndex> source = klmi->indexes(keys);
         QList<QModelIndex> mapped;
         mapped.reserve(source.size());
         std::transform(source.begin(), source.end(),
                        std::back_inserter(mapped),
                        [this](const QModelIndex &idx) {
                            return mapFromSource(idx);
                        });
         return mapped;
     } else {
         return QList<QModelIndex>();
     }
 }
 
 class KeyListSortFilterProxyModel::Private
 {
     friend class ::Kleo::KeyListSortFilterProxyModel;
 public:
     explicit Private()
         : keyFilter() {}
     ~Private() {}
 
 private:
     std::shared_ptr<const KeyFilter> keyFilter;
 };
 
 KeyListSortFilterProxyModel::KeyListSortFilterProxyModel(QObject *p)
     : AbstractKeyListSortFilterProxyModel(p), d(new Private)
 {
 
 }
 
 KeyListSortFilterProxyModel::KeyListSortFilterProxyModel(const KeyListSortFilterProxyModel &other)
     : AbstractKeyListSortFilterProxyModel(other), d(new Private(*other.d))
 {
 
 }
 
 KeyListSortFilterProxyModel::~KeyListSortFilterProxyModel() {}
 
 KeyListSortFilterProxyModel *KeyListSortFilterProxyModel::clone() const
 {
     return new KeyListSortFilterProxyModel(*this);
 }
 
 std::shared_ptr<const KeyFilter> KeyListSortFilterProxyModel::keyFilter() const
 {
     return d->keyFilter;
 }
 
 void KeyListSortFilterProxyModel::setKeyFilter(const std::shared_ptr<const KeyFilter> &kf)
 {
     if (kf == d->keyFilter) {
         return;
     }
     d->keyFilter = kf;
     invalidateFilter();
 }
 
 bool KeyListSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
 
     //
     // 0. Keep parents of matching children:
     //
     const QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
     for (int i = 0, end = sourceModel()->rowCount(index); i != end; ++i)
         if (filterAcceptsRow(i, index)) {
             return true;
         }
 
     //
     // 1. Check filterRegExp
     //
     const int role = filterRole();
     const int col = filterKeyColumn();
     const QRegExp rx = filterRegExp();
     const QModelIndex nameIndex = sourceModel()->index(source_row, PrettyName, source_parent);
 
     const KeyListModelInterface *const klm = dynamic_cast<KeyListModelInterface *>(sourceModel());
     Q_ASSERT(klm);
     const Key key = klm->key(nameIndex);
 
     if (col) {
         const QModelIndex colIdx = sourceModel()->index(source_row, col, source_parent);
         const QString content = colIdx.data(role).toString();
         if (!content.contains(rx)) {
             return false;
         }
     } else {
-        // By default match name and email of any UID
+        // By default match against the full uid data (name / email / comment / dn)
         bool match = false;
-        Q_FOREACH(const auto uid, key.userIDs()) {
-            const auto name = QString::fromUtf8(uid.name());
-            const auto email = QString::fromUtf8(uid.email());
-            if (name.contains(rx) || email.contains(rx)) {
+        for (const auto &uid: key.userIDs()) {
+            const auto id = QString::fromUtf8(uid.id());
+            if (id.contains(rx)) {
                 match = true;
                 break;
             }
         }
         if (!match) {
             return false;
         }
     }
 
     //
     // 2. Check that key filters match (if any are defined)
     //
     if (d->keyFilter) {   // avoid artifacts when no filters are defined
         return d->keyFilter->matches(key, KeyFilter::Filtering);
     }
 
     // 3. match by default:
     return true;
 }