diff --git a/Nasal/prop_key_handler.nas b/Nasal/prop_key_handler.nas
index 982cd8c42..c59b8e60d 100644
--- a/Nasal/prop_key_handler.nas
+++ b/Nasal/prop_key_handler.nas
@@ -283,6 +283,8 @@ var print_prop = func(n) {
 var search = func(n, s) {
 	if (find(s, n.getPath()) >= 0)
 		print_prop(n);
+	if (n.getType() != "NONE" and find(s, "" ~ n.getValue()) >= 0)
+		print_prop(n);
 	foreach (var c; n.getChildren())
 		search(c, s);
 }