diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 87647f2808..41afbf2115 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -90,14 +90,14 @@ export class CollectionPageComponent implements OnInit {
                 dsoType: DSpaceObjectType.ITEM
               })).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>
         }),
-        startWith(undefined) // Make sure switching page shows loading component
+        startWith(undefined) // Make sure switching pages shows loading component
         )
       )
     );
 
     this.route.queryParams.pipe(take(1)).subscribe((params) => {
       this.metadata.processRemoteData(this.collectionRD$);
-      this.onPaginationChange(params)
+      this.onPaginationChange(params);
     })
   }
 
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/+search-page/search-service/search.service.ts
index 52be0417a8..598657a1b2 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/+search-page/search-service/search.service.ts
@@ -354,10 +354,7 @@ export class SearchService implements OnDestroy {
    * @returns {string} The base path to the search page
    */
   getSearchLink(): string {
-    const urlTree = this.router.parseUrl(this.router.url);
-    const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
-    const searchLink: any = '/' + g.toString();
-    return (searchLink !== '/search' && searchLink !== '/mydspace') ? '/search' : searchLink;
+    return '/search';
   }
 
   /**
diff --git a/src/app/+search-page/search-settings/search-settings.component.ts b/src/app/+search-page/search-settings/search-settings.component.ts
index 78a1823ab4..aac861c64f 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/+search-page/search-settings/search-settings.component.ts
@@ -79,7 +79,6 @@ export class SearchSettingsComponent implements OnInit {
     this.router.navigate(this.getSearchLinkParts(), navigationExtras);
   }
 
-
   /**
    * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
    */
@@ -99,5 +98,4 @@ export class SearchSettingsComponent implements OnInit {
     }
     return this.getSearchLink().split('/');
   }
-
 }
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index c98621928c..563dce23d1 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -218,8 +218,7 @@ export class RemoteDataBuildService {
           .map((d: RemoteData<T>) => d.isResponsePending)
           .find((b: boolean) => b === true);
 
-
-        let isSuccessful: boolean = undefined;
+        let isSuccessful: boolean;
         // isSuccessful should be undefined until all responses have come in.
         // We can't know its state beforehand. We also can't say it's false
         // because that would imply a request failed.
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 410c78c1d5..10c3a3ede7 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -69,7 +69,6 @@ export class SearchFormComponent {
    * @param data Updated parameters
    */
   updateSearch(data: any) {
-
     this.router.navigate(this.getSearchLinkParts(), {
       queryParams: Object.assign({}, { page: 1 }, data),
       queryParamsHandling: 'merge'
@@ -83,7 +82,6 @@ export class SearchFormComponent {
     return isNotEmpty(object);
   }
 
-
   /**
    * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
    */