diff --git a/userspace/engine/falco_engine.cpp b/userspace/engine/falco_engine.cpp
index a52caa16..414384f6 100644
--- a/userspace/engine/falco_engine.cpp
+++ b/userspace/engine/falco_engine.cpp
@@ -156,8 +156,7 @@ void falco_engine::list_fields(std::string &source, bool verbose, bool names_onl
 			{
 				for(auto &field : fld_class.fields)
 				{
-					// Skip fields with the EPF_TABLE_ONLY flag.
-					if(field.tags.find("EPF_TABLE_ONLY") != field.tags.end())
+					if(field.is_skippable() || field.is_deprecated())
 					{
 						continue;
 					}