diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 6d1cf8c6331..d7e8ccf0d2a 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1417,13 +1417,13 @@ parameters:
 			path: app/GedcomRecord.php
 
 		-
-			message: '#^Strict comparison using \!\=\= between non\-empty\-string and '''' will always evaluate to true\.$#'
+			message: '#^Strict comparison using \!\=\= between lowercase\-string&non\-falsy\-string and '''' will always evaluate to true\.$#'
 			identifier: notIdentical.alwaysTrue
 			count: 1
 			path: app/GedcomRecord.php
 
 		-
-			message: '#^Strict comparison using \!\=\= between non\-falsy\-string and '''' will always evaluate to true\.$#'
+			message: '#^Strict comparison using \!\=\= between non\-empty\-string and '''' will always evaluate to true\.$#'
 			identifier: notIdentical.alwaysTrue
 			count: 1
 			path: app/GedcomRecord.php
@@ -11532,78 +11532,12 @@ parameters:
 			count: 1
 			path: resources/views/modules/recent_changes/changes-list.phtml
 
-		-
-			message: '#^Access to an undefined property object\:\:\$record\.$#'
-			identifier: property.notFound
-			count: 12
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Access to an undefined property object\:\:\$time\.$#'
-			identifier: property.notFound
-			count: 2
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Access to an undefined property object\:\:\$user\.$#'
-			identifier: property.notFound
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method fullName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method sortName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method tag\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 9
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method timestamp\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method url\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Cannot call method userName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
 		-
 			message: '#^Parameter \#1 \$value of function e expects Illuminate\\Contracts\\Support\\DeferringDisplayableValue\|Illuminate\\Contracts\\Support\\Htmlable\|string\|null, int given\.$#'
 			identifier: argument.type
 			count: 1
 			path: resources/views/modules/recent_changes/changes-table.phtml
 
-		-
-			message: '#^Parameter \#1 \$value of function e expects Illuminate\\Contracts\\Support\\DeferringDisplayableValue\|Illuminate\\Contracts\\Support\\Htmlable\|string\|null, mixed given\.$#'
-			identifier: argument.type
-			count: 3
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
-		-
-			message: '#^Parameter \#1 \(mixed\) of echo cannot be converted to string\.$#'
-			identifier: echo.nonString
-			count: 3
-			path: resources/views/modules/recent_changes/changes-table.phtml
-
 		-
 			message: '#^Parameter \#1 \$value of function e expects Illuminate\\Contracts\\Support\\DeferringDisplayableValue\|Illuminate\\Contracts\\Support\\Htmlable\|string\|null, int given\.$#'
 			identifier: argument.type
@@ -12084,102 +12018,12 @@ parameters:
 			count: 1
 			path: resources/views/modules/yahrzeit/list.phtml
 
-		-
-			message: '#^Access to an undefined property object\:\:\$fact\.$#'
-			identifier: property.notFound
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Access to an undefined property object\:\:\$fact_date\.$#'
-			identifier: property.notFound
-			count: 1
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Access to an undefined property object\:\:\$individual\.$#'
-			identifier: property.notFound
-			count: 7
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Access to an undefined property object\:\:\$yahrzeit_date\.$#'
-			identifier: property.notFound
-			count: 3
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot access property \$anniv on mixed\.$#'
-			identifier: property.nonObject
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method alternateName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method display\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method fullName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method julianDay\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method sortName\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method tree\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 2
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Cannot call method url\(\) on mixed\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Parameter \#1 \$n of static method Fisharebest\\Webtrees\\I18N\:\:number\(\) expects float, mixed given\.$#'
-			identifier: argument.type
-			count: 1
-			path: resources/views/modules/yahrzeit/table.phtml
-
 		-
 			message: '#^Parameter \#1 \$value of function e expects Illuminate\\Contracts\\Support\\DeferringDisplayableValue\|Illuminate\\Contracts\\Support\\Htmlable\|string\|null, int given\.$#'
 			identifier: argument.type
 			count: 1
 			path: resources/views/modules/yahrzeit/table.phtml
 
-		-
-			message: '#^Parameter \#1 \$value of function e expects Illuminate\\Contracts\\Support\\DeferringDisplayableValue\|Illuminate\\Contracts\\Support\\Htmlable\|string\|null, mixed given\.$#'
-			identifier: argument.type
-			count: 5
-			path: resources/views/modules/yahrzeit/table.phtml
-
-		-
-			message: '#^Parameter \#1 \(mixed\) of echo cannot be converted to string\.$#'
-			identifier: echo.nonString
-			count: 4
-			path: resources/views/modules/yahrzeit/table.phtml
-
 		-
 			message: '#^Access to an undefined property object\:\:\$change_id\.$#'
 			identifier: property.notFound
diff --git a/resources/views/lists/anniversaries-table.phtml b/resources/views/lists/anniversaries-table.phtml
index e596d34a2da..9599e8f3dbf 100644
--- a/resources/views/lists/anniversaries-table.phtml
+++ b/resources/views/lists/anniversaries-table.phtml
@@ -57,10 +57,10 @@ use Illuminate\Support\Collection;
                             <small><?= view('icons/sex', ['sex' => $record->sex()]) ?></small>
                         <?php endif ?>
                     </td>
-                    <td data-sort="<?= $fact->jd + $fact->anniv / 10000.0 ?>">
+                    <td data-sort="<?= sprintf('x%07d', $fact->jd + $fact->anniv / 10000.0) ?>">
                         <?= $fact->date()->display($record->tree(), null, true) ?>
                     </td>
-                    <td data-sort="<?= $fact->anniv ?>">
+                    <td data-sort="<?= sprintf('x%07d', $fact->anniv) ?>">
                         <?= $fact->anniv ?>
                     </td>
                     <td data-sort="<?= $fact->label() ?>">
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml
index 7de74045617..cb54a77dfc9 100644
--- a/resources/views/lists/families-table.phtml
+++ b/resources/views/lists/families-table.phtml
@@ -223,7 +223,7 @@ $("#<?= e($table_id) ?>")
                     </td>
 
                     <!-- Marriage date -->
-                    <td data-sort="<?= $family->getMarriageDate()->julianDay() ?>">
+                    <td data-sort="<?= sprintf('x%07d', $family->getMarriageDate()->julianDay()) ?>">
                         <?php if ($marriage_dates = $family->getAllMarriageDates()) : ?>
                             <?php foreach ($marriage_dates as $marriage_date) : ?>
                                 <div><?= $marriage_date->display($tree, null, true) ?></div>
@@ -254,7 +254,7 @@ $("#<?= e($table_id) ?>")
                     </td>
 
                     <!-- Last change -->
-                    <td data-sort="<?= $family->lastChangeTimestamp()->timestamp() ?>">
+                    <td data-sort="<?= sprintf('x%07d', $family->lastChangeTimestamp()->timestamp()) ?>">
                         <?= view('components/datetime', ['timestamp' => $family->lastChangeTimestamp()]) ?>
                     </td>
 
diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml
index a994e9d847b..d62ee635cda 100644
--- a/resources/views/lists/individuals-table.phtml
+++ b/resources/views/lists/individuals-table.phtml
@@ -224,7 +224,7 @@ $("#<?= e($table_id) ?>")
                     <!-- Birthdate -->
                     <?php $estimated_birth_date = $individual->getEstimatedBirthDate(); ?>
 
-                    <td data-sort="<?= $estimated_birth_date->julianDay() ?>">
+                    <td data-sort="<?= sprintf('x%07d', $estimated_birth_date->julianDay()) ?>">
                         <?php $birth_dates = $individual->getAllBirthDates(); ?>
 
                         <?php foreach ($birth_dates as $birth_date) : ?>
@@ -255,7 +255,7 @@ $("#<?= e($table_id) ?>")
 
                     <!-- Death date -->
                     <?php $death_dates = $individual->getAllDeathDates() ?>
-                    <td data-sort="<?= $individual->getEstimatedDeathDate()->julianDay() ?>">
+                    <td data-sort="<?= sprintf('x%07d', $individual->getEstimatedDeathDate()->julianDay()) ?>">
                         <?php foreach ($death_dates as $death_date) : ?>
                             <div><?= $death_date->display($tree, null, true) ?></div>
                         <?php endforeach ?>
@@ -284,7 +284,7 @@ $("#<?= e($table_id) ?>")
                     </td>
 
                     <!-- Last change -->
-                    <td data-sort="<?= $individual->lastChangeTimestamp()->timestamp() ?>">
+                    <td data-sort="<?= sprintf('x%07d', $individual->lastChangeTimestamp()->timestamp()) ?>">
                         <?= view('components/datetime', ['timestamp' => $individual->lastChangeTimestamp()]) ?>
                     </td>
 
@@ -339,4 +339,3 @@ $("#<?= e($table_id) ?>")
         </tfoot>
     </table>
 </div>
-
diff --git a/resources/views/lists/locations-table.phtml b/resources/views/lists/locations-table.phtml
index 1ef3976c06b..f8086a0504b 100644
--- a/resources/views/lists/locations-table.phtml
+++ b/resources/views/lists/locations-table.phtml
@@ -90,7 +90,7 @@ $count_families = DB::table('families')
                 </td>
 
                 <!-- Last change -->
-                <td data-sort="<?= $location->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $location->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $location->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml
index b1eebfebe67..26178420120 100644
--- a/resources/views/lists/media-table.phtml
+++ b/resources/views/lists/media-table.phtml
@@ -118,7 +118,7 @@ $count_sources = DB::table('sources')
                 </td>
 
                 <!-- Last change -->
-                <td data-sort="<?= $media_object->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $media_object->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $media_object->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml
index 8f59ae43b07..ab5fe03d857 100644
--- a/resources/views/lists/notes-table.phtml
+++ b/resources/views/lists/notes-table.phtml
@@ -128,7 +128,7 @@ $count_sources = DB::table('sources')
                 </td>
 
                 <!-- Last change -->
-                <td data-sort="<?= $note->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $note->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $note->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml
index 76d754238f6..6c322f61b85 100644
--- a/resources/views/lists/repositories-table.phtml
+++ b/resources/views/lists/repositories-table.phtml
@@ -71,7 +71,7 @@ $count_sources = DB::table('sources')
                 </td>
 
                 <!-- Last change -->
-                <td data-sort="<?= $repository->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $repository->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $repository->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml
index 41a96578887..d5d5515d08c 100644
--- a/resources/views/lists/sources-table.phtml
+++ b/resources/views/lists/sources-table.phtml
@@ -151,7 +151,7 @@ $count_notes = DB::table('other')
                 </td>
 
                 <!-- Last change -->
-                <td data-sort="<?= $source->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $source->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $source->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/submitters-table.phtml b/resources/views/lists/submitters-table.phtml
index 01d9d1890b2..73ab1be9ccd 100644
--- a/resources/views/lists/submitters-table.phtml
+++ b/resources/views/lists/submitters-table.phtml
@@ -90,7 +90,7 @@ $count_families = DB::table('families')
                     <?= I18N::number($count_families[$submitter->xref()] ?? 0) ?>
                 </td>
 
-                <td data-sort="<?= $submitter->lastChangeTimestamp()->timestamp() ?>">
+                <td data-sort="<?= sprintf('x%07d', $submitter->lastChangeTimestamp()->timestamp()) ?>">
                     <?= view('components/datetime', ['timestamp' => $submitter->lastChangeTimestamp()]) ?>
                 </td>
             </tr>
diff --git a/resources/views/lists/surnames-table.phtml b/resources/views/lists/surnames-table.phtml
index f6df1dbc4f9..7138202ec9b 100644
--- a/resources/views/lists/surnames-table.phtml
+++ b/resources/views/lists/surnames-table.phtml
@@ -47,7 +47,7 @@ use Fisharebest\Webtrees\Tree;
     <tbody>
         <?php foreach ($surnames as $surn => $surns) : ?>
             <tr>
-                <td data-sort="<?= $n = 1 + ($n ?? 0) ?>">
+                <td data-sort="<?= sprintf('x%07d', $n = 1 + ($n ?? 0)) ?>">
                     <!-- Multiple surname variants, e.g. von Groot, van Groot, van der Groot, etc. -->
                     <?php foreach (array_keys($surns) as $surname) : ?>
                         <?php if ($module instanceof IndividualListModule) : ?>
diff --git a/resources/views/modules/recent_changes/changes-table.phtml b/resources/views/modules/recent_changes/changes-table.phtml
index c6ce0e29cbc..7d144ed368b 100644
--- a/resources/views/modules/recent_changes/changes-table.phtml
+++ b/resources/views/modules/recent_changes/changes-table.phtml
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
+use Fisharebest\Webtrees\Contracts\UserInterface;
 use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\GedcomRecord;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Location;
@@ -11,16 +13,17 @@ use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Repository;
 use Fisharebest\Webtrees\Source;
 use Fisharebest\Webtrees\Submitter;
+use Fisharebest\Webtrees\Timestamp;
 use Fisharebest\Webtrees\View;
 use Illuminate\Support\Collection;
 
 /**
- * @var int                      $limit_high
- * @var int                      $limit_low
- * @var array<array<int,string>> $order
- * @var Collection<int,object>   $rows
- * @var bool                     $show_date
- * @var bool                     $show_user
+ * @var int                                                                           $limit_high
+ * @var int                                                                           $limit_low
+ * @var array<array<int,string>>                                                      $order
+ * @var Collection<int,object{record:GedcomRecord,time:Timestamp,user:UserInterface}> $rows
+ * @var bool                                                                          $show_date
+ * @var bool                                                                          $show_user
  */
 ?>
 
@@ -88,7 +91,7 @@ use Illuminate\Support\Collection;
                         <a href="<?= e($row->record->url()) ?>"><?= $row->record->fullName() ?></a>
                     </td>
 
-                    <td data-sort="<?= $row->time->timestamp() ?>" class="<?= $show_date ? '' : 'd-none' ?>">
+                    <td data-sort="<?= sprintf('x%07d', $row->time->timestamp()) ?>" class="<?= $show_date ? '' : 'd-none' ?>">
                         <?= view('components/datetime', ['timestamp' => $row->time]) ?>
                     </td>
 
diff --git a/resources/views/modules/todo/research-tasks.phtml b/resources/views/modules/todo/research-tasks.phtml
index 88651f33bf2..edc67ce8639 100644
--- a/resources/views/modules/todo/research-tasks.phtml
+++ b/resources/views/modules/todo/research-tasks.phtml
@@ -44,7 +44,7 @@ use Illuminate\Support\Collection;
     <tbody>
         <?php foreach ($tasks as $task) : ?>
             <tr>
-                <td data-sort="<?= $task->date()->julianDay() ?>" class="d-none d-md-table-cell wt-side-block-optional">
+                <td data-sort="<?= sprintf('x%07d', $task->date()->julianDay()) ?>" class="d-none d-md-table-cell wt-side-block-optional">
                     <?= $task->date()->display() ?>
                 </td>
                 <td data-sort="<?= e($task->record()->sortName()) ?>">
diff --git a/resources/views/modules/yahrzeit/table.phtml b/resources/views/modules/yahrzeit/table.phtml
index 9e94b1195c5..d79ea085183 100644
--- a/resources/views/modules/yahrzeit/table.phtml
+++ b/resources/views/modules/yahrzeit/table.phtml
@@ -2,13 +2,16 @@
 
 declare(strict_types=1);
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Illuminate\Support\Collection;
 
 /**
- * @var int                    $limit_high
- * @var int                    $limit_low
- * @var Collection<int,object> $yahrzeits
+ * @var int                                                                                       $limit_high
+ * @var int                                                                                       $limit_low
+ * @var Collection<int,object{individual:Individual,yahrzeit_date:Date,fact_date:Date,fact:Fact}> $yahrzeits
  */
 
 ?>
@@ -49,13 +52,13 @@ use Illuminate\Support\Collection;
                             <?php endif ?>
                         </a>
                     </td>
-                    <td data-sort="<?= e($yahrzeit->yahrzeit_date->julianDay()) ?>">
+                    <td data-sort="<?= sprintf('x%07d', $yahrzeit->yahrzeit_date->julianDay()) ?>">
                         <?= $yahrzeit->fact_date->display($yahrzeit->individual->tree()) ?>
                     </td>
-                    <td data-sort="<?= e($yahrzeit->fact->anniv) ?>">
+                    <td data-sort="<?= sprintf('x%07d', $yahrzeit->fact->anniv) ?>">
                         <?= I18N::number($yahrzeit->fact->anniv) ?>
                     </td>
-                    <td data-sort="<?= e($yahrzeit->yahrzeit_date->julianDay()) ?>">
+                    <td data-sort="<?= sprintf('x%07d', $yahrzeit->yahrzeit_date->julianDay()) ?>">
                         <?= $yahrzeit->yahrzeit_date->display($yahrzeit->individual->tree()) ?>
                     </td>
                 </tr>