diff --git a/www/idpSearch.php b/www/idpSearch.php
index f3e873238c3e77d695f42e8ea61a255bdab8c1c5..bb485f8e53a8811373dcf6ae6108f41c17162d9f 100644
--- a/www/idpSearch.php
+++ b/www/idpSearch.php
@@ -43,7 +43,7 @@ if (!empty($_GET['idphint']) && !isset($_GET['index'])) {
         foreach ($metadata as $entityid => $idpentry) {
             if (!empty($searchBox['include']['tags'])) {
                 foreach ($searchBox['include']['tags'] as $tag) {
-                    if ($tag === $idpentry['tag']) {
+                    if (!empty($idpentry['tag']) && $tag === $idpentry['tag']) {
                         $filteredMetadata[$entityid] = $idpentry;
                         break;
                     }
@@ -75,7 +75,7 @@ if (!empty($_GET['idphint']) && !isset($_GET['index'])) {
     foreach ($metadata as $entityid => $idpentry) {
         if (!empty($searchBox['exclude']['tags'])) {
             foreach ($searchBox['exclude']['tags'] as $tag) {
-                if ($tag === $idpentry['tag']) {
+                if (!empty($idpentry['tag']) && $tag === $idpentry['tag']) {
                     unset($metadata[$entityid]);
                     break;
                 }