diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index 1d1b031d0..c49fc9e36 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -121,7 +121,9 @@ export class AppComponent {
         filter(event => event instanceof NavigationEnd)
       )
       .subscribe(() => {
-        this.page = this.router.routerState.snapshot.url;
+        this.page = this.router.routerState.snapshot.url.split('?')[0];
+
+        console.log('Navigated to page:', this.page);
 
         if (this.router.routerState.snapshot.root.queryParams.mode === 'demo') {
           console.log('App component, demo mode search params found');
diff --git a/frontend/src/app/components/upgrade/upgrade.component.ts b/frontend/src/app/components/upgrade/upgrade.component.ts
index 2e4a48860..f94e259fb 100644
--- a/frontend/src/app/components/upgrade/upgrade.component.ts
+++ b/frontend/src/app/components/upgrade/upgrade.component.ts
@@ -5,12 +5,12 @@ import { CommonModule } from '@angular/common';
 import { CompanyService } from 'src/app/services/company.service';
 import { MatButtonModule } from '@angular/material/button';
 import { MatChipsModule } from '@angular/material/chips';
+import { MatIconModule } from '@angular/material/icon';
 import { MatTableModule } from '@angular/material/table';
 import { PaymentService } from 'src/app/services/payment.service';
 import { PlanKey } from 'src/app/models/plans';
 import { RouterModule } from '@angular/router';
 import plans from '../../consts/plans';
-import { MatIconModule } from '@angular/material/icon';
 
 @Component({
   selector: 'app-upgrade',
@@ -109,18 +109,6 @@ export class UpgradeComponent implements OnInit {
   ]
 
   features = [
-    // {
-    //   title: 'Database',
-    //   free: 'MySQL, PostgreSQL, MongoDB',
-    //   team: 'MySQL, PostgreSQL, MongoDB',
-    //   enterprise: 'MySQL, PostgreSQL, MongoDB, \n Oracle, Microsoft SQL'
-    // },
-    // {
-    //   title: 'Number of users',
-    //   free: 'up to 3 members',
-    //   team: 'per 10 members',
-    //   enterprise: 'per 10 members'
-    // },
     {
       title: 'Standard actions (CRUD)',
       free: true,