diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index 0d32431651..c31295c235 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -399,6 +399,10 @@ class JournalCollector implements JournalCollectorInterface
      */
     public function setPage(int $page): JournalCollectorInterface
     {
+        if ($page < 1) {
+            $page = 1;
+        }
+
         $this->page = $page;
 
         if ($page > 0) {
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 441ce0f345..db8c7b7f9c 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -254,7 +254,7 @@ class AccountController extends Controller
         $currencyRepos = app(CurrencyRepositoryInterface::class);
         $range         = Preferences::get('viewRange', '1M')->data;
         $subTitleIcon  = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
-        $page          = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page          = intval($request->get('page'));
         $pageSize      = intval(Preferences::get('transactionPageSize', 50)->data);
         $chartUri      = route('chart.account.single', [$account->id]);
         $start         = null;
@@ -275,22 +275,20 @@ class AccountController extends Controller
         if (strlen($moment) > 0 && $moment !== 'all') {
             $start    = new Carbon($moment);
             $end      = Navigation::endOfPeriod($start, $range);
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
+            $fStart   = $start->formatLocalized($this->monthAndDayFormat);
+            $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
+            $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
             $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]);
             $periods  = $this->getPeriodOverview($account);
         }
 
-        // prep for current period
+        // prep for current period view
         if (strlen($moment) === 0) {
             $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
             $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
+            $fStart   = $start->formatLocalized($this->monthAndDayFormat);
+            $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
+            $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
             $periods  = $this->getPeriodOverview($account);
         }
 
@@ -307,7 +305,7 @@ class AccountController extends Controller
                 $collector->setRange($start, $end);
             }
             $journals = $collector->getPaginatedJournals();
-            $journals->setPath(route('accounts.show',[$account->id, $moment]));
+            $journals->setPath(route('accounts.show', [$account->id, $moment]));
             $count = $journals->getCollection()->count();
             if ($count === 0 && $loop < 3) {
                 $start->subDay();
@@ -318,11 +316,10 @@ class AccountController extends Controller
         }
 
         if ($moment !== 'all' && $loop > 1) {
+            $fStart   = $start->formatLocalized($this->monthAndDayFormat);
+            $fEnd     = $end->formatLocalized($this->monthAndDayFormat);
             $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]);
-            $subTitle = trans(
-                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-            );
+            $subTitle = trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
             Session::flash('info', trans('firefly.jump_back_in_time'));
         }
 
diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php
index e36fb62b2c..38139d5102 100644
--- a/app/Http/Controllers/BillController.php
+++ b/app/Http/Controllers/BillController.php
@@ -206,7 +206,7 @@ class BillController extends Controller
         /** @var Carbon $date */
         $date           = session('start');
         $year           = $date->year;
-        $page           = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page           = intval($request->get('page'));
         $pageSize       = intval(Preferences::get('transactionPageSize', 50)->data);
         $yearAverage    = $repository->getYearAverage($bill, $date);
         $overallAverage = $repository->getOverallAverage($bill);
diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php
index b4df6e2a85..bd385094b1 100644
--- a/app/Http/Controllers/BudgetController.php
+++ b/app/Http/Controllers/BudgetController.php
@@ -294,7 +294,7 @@ class BudgetController extends Controller
             );
         }
 
-        $page     = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page     = intval($request->get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
 
         $count = 0;
@@ -359,7 +359,7 @@ class BudgetController extends Controller
         /** @var Carbon $start */
         $start      = session('first', Carbon::create()->startOfYear());
         $end        = new Carbon;
-        $page       = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page       = intval($request->get('page'));
         $pageSize   = intval(Preferences::get('transactionPageSize', 50)->data);
         $limits     = $this->getLimits($budget, $start, $end);
         $repetition = null;
@@ -390,7 +390,7 @@ class BudgetController extends Controller
             throw new FireflyException('This budget limit is not part of this budget.');
         }
 
-        $page     = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page     = intval($request->get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
         $subTitle = trans(
             'firefly.budget_in_period', [
diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 8ec29fc70f..871112d16d 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -200,7 +200,7 @@ class CategoryController extends Controller
             );
         }
 
-        $page     = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page     = intval($request->get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
 
         $count = 0;
@@ -249,7 +249,7 @@ class CategoryController extends Controller
         // default values:
         $subTitle     = $category->name;
         $subTitleIcon = 'fa-bar-chart';
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
         $count        = 0;
         $loop         = 0;
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 4c6e0268c2..9ddbaa34cd 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -235,7 +235,7 @@ class ImportController extends Controller
         // get possible warning from configurator:
         $warning = $configurator->getWarningMessage();
 
-        if(strlen($warning) > 0) {
+        if (strlen($warning) > 0) {
             Session::flash('warning', $warning);
         }
 
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index df4bf6e8e1..ce3189cf52 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -215,7 +215,7 @@ class TagController extends Controller
         // default values:
         $subTitle     = $tag->tag;
         $subTitleIcon = 'fa-tag';
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
         $count        = 0;
         $loop         = 0;
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 7cb01a557d..ddcdcfead8 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -71,7 +71,7 @@ class TransactionController extends Controller
         // default values:
         $subTitleIcon = config('firefly.transactionIconsByWhat.' . $what);
         $types        = config('firefly.transactionTypesByWhat.' . $what);
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
+        $page         = intval($request->get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
         $count        = 0;
         $loop         = 0;
@@ -94,7 +94,7 @@ class TransactionController extends Controller
         if (strlen($moment) > 0 && $moment !== 'all') {
             $start    = new Carbon($moment);
             $end      = Navigation::endOfPeriod($start, $range);
-            $path         = route('transactions.index', [$what, $moment]);
+            $path     = route('transactions.index', [$what, $moment]);
             $subTitle = trans(
                 'firefly.title_' . $what . '_between',
                 ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index d878473760..142b3b21ab 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -817,6 +817,7 @@ Breadcrumbs::register(
     }
 
     $breadcrumbs->parent('index');
+
     return;
 }
 );