diff --git a/ChangeLog b/ChangeLog
index a8954a215..9d96efa9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,14 +4,15 @@
           Sujeevan Vijayakumaran).
 - TW-1492 compiling v2.4.0 using musl(libc) (thanks to V.Krishn).
 - TW-1495 German translation for taskwarrior (thanks to Jens Erat).
+- TW-1498 Filtering for presence of UDA matches all tasks (thanks to Ralph Bean).
 - TW-1501 Calc can't handle multi-digit numbers in some expressions (thanks to
           Jeremy John Reeder).
+- TW-1505 completely ignore mis-named hook scripts (thanks to Tomas Babej,
+          David Patrick).
 - Fixed assorted color theme problems.
 - Changed assorted reports so they do not use '.age' format for dates that are
   in the future, because those are never shown with this format (thanks to
   Sujeevan Vijayakumaran).
-- The 'diag' command should indicate misnamed hook scripts (thanks to Tomas
-  Babej).
 
 ------ current release ---------------------------
 
diff --git a/src/DOM.cpp b/src/DOM.cpp
index 42f40023b..e3647e351 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -240,6 +240,12 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
       Column* column = context.columns[canonical];
       if (column)
       {
+        if (column->is_uda () && ! task.has (canonical))
+        {
+          value = Variant ("''");
+          return true;
+        }
+
         if (column->type () == "date")
           value = Variant (task.get_date (canonical), Variant::type_date);
         else if (column->type () == "duration" || canonical == "recur")
@@ -307,6 +313,12 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value)
           Column* column = context.columns[canonical];
           if (column)
           {
+            if (column->is_uda () && ! task.has (canonical))
+            {
+              value = Variant ("''");
+              return true;
+            }
+
             if (column->type () == "date")
               value = Variant (ref.get_date (canonical), Variant::type_date);
             else if (column->type () == "duration")