diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php
index 88e0cb7eb..f5700b643 100644
--- a/legacy/application/models/Block.php
+++ b/legacy/application/models/Block.php
@@ -1596,7 +1596,7 @@ SQL;
                         }
 
                         if ($spCriteria == 'filepath') {
-                            $spCriteria = "split_part(filepath, '/', -1)";
+                            $spCriteria = "reverse(split_part(reverse(filepath), '/', 1))";
                         }
 
                         if ($i > 0 && $prevgroup == $group) {
diff --git a/legacy/application/models/StoredFile.php b/legacy/application/models/StoredFile.php
index e79d1692c..81b8f8758 100644
--- a/legacy/application/models/StoredFile.php
+++ b/legacy/application/models/StoredFile.php
@@ -750,7 +750,7 @@ SQL;
             } elseif ($key === 'filepath') {
                 $plSelect[] = 'NULL::VARCHAR AS ' . $key;
                 $blSelect[] = 'NULL::VARCHAR AS ' . $key;
-                $fileSelect[] = "split_part({$key}, '/', -1) as {$key}";
+                $fileSelect[] = "reverse(split_part(reverse({$key}), '/', 1)) as {$key}";
                 $streamSelect[] = 'url AS ' . $key;
             } elseif ($key == 'mime') {
                 $plSelect[] = 'NULL::VARCHAR AS ' . $key;