diff --git a/src/app/map-location/map-location-edit/map-location-edit.component.html b/src/app/map-location/map-location-edit/map-location-edit.component.html
index 16bbffe..3c9f579 100644
--- a/src/app/map-location/map-location-edit/map-location-edit.component.html
+++ b/src/app/map-location/map-location-edit/map-location-edit.component.html
@@ -9,9 +9,12 @@
         </div>
       </div>
       <form [formGroup]="mapLocationForm" (ngSubmit)="onSubmit()">
-        <div class="col-xs-12">
+        <div *ngIf="!editMode" class="col-xs-12">
           <h2>Adding New Point</h2>
         </div>
+        <div *ngIf="editMode" class="col-xs-12">
+          <h2>Editing map location</h2>
+        </div>
         <div class="row">
           <div class="col-xs-12">
             <button
diff --git a/src/app/route/route-list/route-list.component.ts b/src/app/route/route-list/route-list.component.ts
index a2beefa..0dc10bf 100644
--- a/src/app/route/route-list/route-list.component.ts
+++ b/src/app/route/route-list/route-list.component.ts
@@ -86,11 +86,12 @@ export class RouteListComponent {
   }
 
   onGetRoutesByName() {
+    this.currentPageNumber = 1;
     this.router.navigate(
       [],
       {
         relativeTo: this.activatedRoute,
-        queryParams: {routeName: this.routeNameToSearch},
+        queryParams: {page: this.currentPageNumber, routeName: this.routeNameToSearch},
         queryParamsHandling: 'merge',
       }
     );
@@ -99,7 +100,9 @@ export class RouteListComponent {
 
   onClearFilters() {
     this.routeNameToSearch = "";
+    this.currentPageNumber = 1;
     this.getRoutes();
+    this.onPageChanged()
   }
 
   showCurrentPageNumber() {