diff --git a/src/search/heuristics/additive_heuristic.cc b/src/search/heuristics/additive_heuristic.cc
index aff35d07be..943c2789c2 100644
--- a/src/search/heuristics/additive_heuristic.cc
+++ b/src/search/heuristics/additive_heuristic.cc
@@ -159,15 +159,11 @@ class AdditiveHeuristicFeature
 
         document_language_support("action costs", "supported");
         document_language_support("conditional effects", "supported");
-        document_language_support(
-            "axioms",
-            "supported (in the sense that the planner won't complain -- "
-            "handling of axioms might be very stupid "
-            "and even render the heuristic unsafe)");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "no");
         document_property("consistent", "no");
-        document_property("safe", "yes for tasks without axioms");
+        document_property("safe", "yes");
         document_property("preferred operators", "yes");
     }
 
diff --git a/src/search/heuristics/cea_heuristic.cc b/src/search/heuristics/cea_heuristic.cc
index 952f905220..8f1c25f84d 100644
--- a/src/search/heuristics/cea_heuristic.cc
+++ b/src/search/heuristics/cea_heuristic.cc
@@ -458,11 +458,7 @@ class ContextEnhancedAdditiveHeuristicFeature
 
         document_language_support("action costs", "supported");
         document_language_support("conditional effects", "supported");
-        document_language_support(
-            "axioms",
-            "supported (in the sense that the planner won't complain -- "
-            "handling of axioms might be very stupid "
-            "and even render the heuristic unsafe)");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "no");
         document_property("consistent", "no");
diff --git a/src/search/heuristics/cg_heuristic.cc b/src/search/heuristics/cg_heuristic.cc
index a8dea593db..313f3e8ee7 100644
--- a/src/search/heuristics/cg_heuristic.cc
+++ b/src/search/heuristics/cg_heuristic.cc
@@ -303,11 +303,7 @@ class CGHeuristicFeature
 
         document_language_support("action costs", "supported");
         document_language_support("conditional effects", "supported");
-        document_language_support(
-            "axioms",
-            "supported (in the sense that the planner won't complain -- "
-            "handling of axioms might be very stupid "
-            "and even render the heuristic unsafe)");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "no");
         document_property("consistent", "no");
diff --git a/src/search/heuristics/ff_heuristic.cc b/src/search/heuristics/ff_heuristic.cc
index 39f727258c..3c98e97bca 100644
--- a/src/search/heuristics/ff_heuristic.cc
+++ b/src/search/heuristics/ff_heuristic.cc
@@ -84,15 +84,11 @@ class FFHeuristicFeature
 
         document_language_support("action costs", "supported");
         document_language_support("conditional effects", "supported");
-        document_language_support(
-            "axioms",
-            "supported (in the sense that the planner won't complain -- "
-            "handling of axioms might be very stupid "
-            "and even render the heuristic unsafe)");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "no");
         document_property("consistent", "no");
-        document_property("safe", "yes for tasks without axioms");
+        document_property("safe", "yes");
         document_property("preferred operators", "yes");
     }
 
diff --git a/src/search/heuristics/max_heuristic.cc b/src/search/heuristics/max_heuristic.cc
index a0d78e2f8a..ee7691278a 100644
--- a/src/search/heuristics/max_heuristic.cc
+++ b/src/search/heuristics/max_heuristic.cc
@@ -113,15 +113,11 @@ class HSPMaxHeuristicFeature
 
         document_language_support("action costs", "supported");
         document_language_support("conditional effects", "supported");
-        document_language_support(
-            "axioms",
-            "supported (in the sense that the planner won't complain -- "
-            "handling of axioms might be very stupid "
-            "and even render the heuristic unsafe)");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "yes for tasks without axioms");
         document_property("consistent", "yes for tasks without axioms");
-        document_property("safe", "yes for tasks without axioms");
+        document_property("safe", "yes");
         document_property("preferred operators", "no");
     }
 
diff --git a/src/search/landmarks/landmark_sum_heuristic.cc b/src/search/landmarks/landmark_sum_heuristic.cc
index 51f447a54f..303b9ea72d 100644
--- a/src/search/landmarks/landmark_sum_heuristic.cc
+++ b/src/search/landmarks/landmark_sum_heuristic.cc
@@ -185,15 +185,14 @@ class LandmarkSumHeuristicFeature
             "conditional_effects",
             "supported if the LandmarkFactory supports them; otherwise "
             "ignored");
-        document_language_support("axioms", "ignored");
+        document_language_support("axioms", "supported");
 
         document_property("admissible", "no");
         document_property("consistent", "no");
         document_property(
             "safe",
-            "yes except on tasks with axioms or on tasks with "
-            "conditional effects when using a LandmarkFactory "
-            "not supporting them");
+            "yes except on tasks with conditional effects when "
+            "using a LandmarkFactory not supporting them");
     }
 
     virtual shared_ptr<LandmarkSumHeuristic> create_component(
diff --git a/src/search/tasks/default_value_axioms_task.cc b/src/search/tasks/default_value_axioms_task.cc
index 61241f7b59..e080bcf494 100644
--- a/src/search/tasks/default_value_axioms_task.cc
+++ b/src/search/tasks/default_value_axioms_task.cc
@@ -421,9 +421,9 @@ static plugins::TypedEnumPlugin<AxiomHandlingType> _enum_plugin({
         {"approximate_negative_cycles",
          "Overapproximate negated axioms for all derived variables which "
          "have cyclic dependencies by setting an empty condition, "
-         "indicating the default value can always be achieved for free."
+         "indicating the default value can always be achieved for free. "
          "For all other derived variables, the negated axioms are computed"
          "exactly. Note that this can potentially lead to a combinatorial "
-         "explosion"}
+         "explosion."}
     });
 }