diff --git a/src/DataTables/Filters/Constraints/Part/TagsConstraint.php b/src/DataTables/Filters/Constraints/Part/TagsConstraint.php
index baae69c7..ae9d14cd 100644
--- a/src/DataTables/Filters/Constraints/Part/TagsConstraint.php
+++ b/src/DataTables/Filters/Constraints/Part/TagsConstraint.php
@@ -30,16 +30,9 @@ class TagsConstraint extends AbstractConstraint
 {
     final public const ALLOWED_OPERATOR_VALUES = ['ANY', 'ALL', 'NONE'];
 
-    /**
-     * @param string $value
-     */
-    public function __construct(string $property, string $identifier = null, /**
-     * @var string The value to compare to
-     */
-    protected $value = null, /**
-     * @var string|null The operator to use
-     */
-    protected ?string $operator = '')
+    public function __construct(string $property, string $identifier = null,
+        protected ?string $value = null,
+        protected ?string $operator = '')
     {
         parent::__construct($property, $identifier);
     }
@@ -61,12 +54,12 @@ class TagsConstraint extends AbstractConstraint
         return $this;
     }
 
-    public function getValue(): string
+    public function getValue(): ?string
     {
         return $this->value;
     }
 
-    public function setValue(string $value): self
+    public function setValue(?string $value): self
     {
         $this->value = $value;
         return $this;
diff --git a/src/DataTables/Filters/Constraints/TextConstraint.php b/src/DataTables/Filters/Constraints/TextConstraint.php
index 186a4477..89567d83 100644
--- a/src/DataTables/Filters/Constraints/TextConstraint.php
+++ b/src/DataTables/Filters/Constraints/TextConstraint.php
@@ -33,9 +33,9 @@ class TextConstraint extends AbstractConstraint
      * @param string $value
      */
     public function __construct(string $property, string $identifier = null, /**
-     * @var string The value to compare to
+     * @var string|null The value to compare to
      */
-    protected $value = null, /**
+    protected ?string $value = null, /**
      * @var string|null The operator to use
      */
     protected ?string $operator = '')
@@ -60,12 +60,12 @@ class TextConstraint extends AbstractConstraint
         return $this;
     }
 
-    public function getValue(): string
+    public function getValue(): ?string
     {
         return $this->value;
     }
 
-    public function setValue(string $value): self
+    public function setValue(?string $value): self
     {
         $this->value = $value;
         return $this;