diff --git a/demo-shell/src/app/components/search/search-result.component.ts b/demo-shell/src/app/components/search/search-result.component.ts
index 13f0870ec4..50bcf9d3eb 100644
--- a/demo-shell/src/app/components/search/search-result.component.ts
+++ b/demo-shell/src/app/components/search/search-result.component.ts
@@ -17,7 +17,7 @@
 
 import { Component, OnInit, Optional, OnDestroy } from '@angular/core';
 import { Router, ActivatedRoute, Params } from '@angular/router';
-import { NodePaging, Pagination, ResultSetPaging } from '@alfresco/js-api';
+import { Pagination, ResultSetPaging } from '@alfresco/js-api';
 import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
 import { UserPreferencesService, SearchService, AppConfigService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
@@ -33,7 +33,7 @@ export class SearchResultComponent implements OnInit, OnDestroy {
 
     queryParamName = 'q';
     searchedWord = '';
-    data: NodePaging;
+    data: ResultSetPaging;
     pagination: Pagination;
     isLoading = true;
 
diff --git a/lib/content-services/content-node-selector/content-node-selector.service.ts b/lib/content-services/content-node-selector/content-node-selector.service.ts
index 9996b70bdf..4e8c0178f2 100644
--- a/lib/content-services/content-node-selector/content-node-selector.service.ts
+++ b/lib/content-services/content-node-selector/content-node-selector.service.ts
@@ -17,7 +17,7 @@
 
 import { SearchService } from '@alfresco/adf-core';
 import { Injectable } from '@angular/core';
-import { NodePaging } from '@alfresco/js-api';
+import { ResultSetPaging } from '@alfresco/js-api';
 import { Observable } from 'rxjs';
 
 /**
@@ -42,7 +42,7 @@ export class ContentNodeSelectorService {
      * the rootNodeId is one of the supported aliases (e.g. '-my-', '-root-', '-mysites-', etc.)
      * and search is not supported for that alias, but can be performed on its corresponding nodes.
      */
-    public search(searchTerm: string, rootNodeId: string = null, skipCount: number = 0, maxItems: number = 25, extraNodeIds?: string[]): Observable<NodePaging> {
+    public search(searchTerm: string, rootNodeId: string = null, skipCount: number = 0, maxItems: number = 25, extraNodeIds?: string[]): Observable<ResultSetPaging> {
 
         let extraParentFiltering = '';
 
diff --git a/lib/content-services/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/content-node-share/content-node-share.directive.spec.ts
index 804a731707..4446d38e4e 100644
--- a/lib/content-services/content-node-share/content-node-share.directive.spec.ts
+++ b/lib/content-services/content-node-share/content-node-share.directive.spec.ts
@@ -20,7 +20,7 @@ import { TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ComponentFixture } from '@angular/core/testing';
 import { Component } from '@angular/core';
-import { DOCUMENT } from '@angular/platform-browser';
+import { DOCUMENT } from '@angular/common';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { setupTestBed, CoreModule, SharedLinksApiService } from '@alfresco/adf-core';
 import { ContentNodeShareModule } from './content-node-share.module';
diff --git a/lib/content-services/search/components/search-filter/search-filter.component.ts b/lib/content-services/search/components/search-filter/search-filter.component.ts
index 46d0bd3d76..cc976dc1b0 100644
--- a/lib/content-services/search/components/search-filter/search-filter.component.ts
+++ b/lib/content-services/search/components/search-filter/search-filter.component.ts
@@ -23,7 +23,7 @@ import { FacetFieldBucket } from '../../facet-field-bucket.interface';
 import { FacetField } from '../../facet-field.interface';
 import { SearchFilterList } from './models/search-filter-list.model';
 import { takeUntil } from 'rxjs/operators';
-import { GenericBucket, GenericFacetResponse, ResultSetContext } from '@alfresco/js-api';
+import { GenericBucket, GenericFacetResponse, ResultSetContext, ResultSetPaging } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
 
 @Component({
@@ -78,7 +78,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
         if (this.queryBuilder) {
             this.queryBuilder.executed
                 .pipe(takeUntil(this.onDestroy$))
-                .subscribe(resultSetPaging => {
+                .subscribe((resultSetPaging: ResultSetPaging) => {
                     this.onDataLoaded(resultSetPaging);
                     this.searchService.dataLoaded.next(resultSetPaging);
                 });
@@ -328,7 +328,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
         };
     }
 
-    private getCorrespondingFilterQuery (configFacetItem: FacetField, bucketLabel: string): string {
+    private getCorrespondingFilterQuery(configFacetItem: FacetField, bucketLabel: string): string {
         let filterQuery = null;
 
         if (configFacetItem.field && bucketLabel) {
@@ -397,7 +397,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
         });
     }
 
-    private getBucketFilterFunction (bucketList) {
+    private getBucketFilterFunction(bucketList) {
         return (bucket: FacetFieldBucket): boolean => {
             if (bucket && bucketList.filterText) {
                 const pattern = (bucketList.filterText || '').toLowerCase();
diff --git a/lib/content-services/search/components/search.component.ts b/lib/content-services/search/components/search.component.ts
index c8f11138f6..66df77c6d9 100644
--- a/lib/content-services/search/components/search.component.ts
+++ b/lib/content-services/search/components/search.component.ts
@@ -30,7 +30,7 @@ import {
     ViewEncapsulation,
     OnDestroy
 } from '@angular/core';
-import { NodePaging } from '@alfresco/js-api';
+import { NodePaging, ResultSetPaging } from '@alfresco/js-api';
 import { Subject } from 'rxjs';
 import { debounceTime, takeUntil } from 'rxjs/operators';
 
@@ -165,9 +165,9 @@ export class SearchComponent implements AfterContentInit, OnChanges, OnDestroy {
         }
     }
 
-    onSearchDataLoaded(nodePaging: NodePaging) {
-        if (nodePaging) {
-            this.results = nodePaging;
+    onSearchDataLoaded(resultSetPaging: ResultSetPaging) {
+        if (resultSetPaging) {
+            this.results = <NodePaging> resultSetPaging;
             this.resultLoaded.emit(this.results);
             this.isOpen = true;
             this.setVisibility();
diff --git a/lib/core/clipboard/clipboard.service.ts b/lib/core/clipboard/clipboard.service.ts
index 32eb064a19..4ec693b8b6 100644
--- a/lib/core/clipboard/clipboard.service.ts
+++ b/lib/core/clipboard/clipboard.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable, Inject } from '@angular/core';
-import { DOCUMENT } from '@angular/platform-browser';
+import { DOCUMENT } from '@angular/common';
 import { LogService } from '../services/log.service';
 import { NotificationService } from '../notifications/services/notification.service';
 
diff --git a/lib/core/login/components/login.component.ts b/lib/core/login/components/login.component.ts
index ac270a3a0b..698dfb1e63 100644
--- a/lib/core/login/components/login.component.ts
+++ b/lib/core/login/components/login.component.ts
@@ -35,7 +35,7 @@ import {
     AppConfigValues
 } from '../../app-config/app-config.service';
 import { OauthConfigModel } from '../../models/oauth-config.model';
-import { DomSanitizer } from '@angular/platform-browser';
+import { DomSanitizer, SafeStyle } from '@angular/platform-browser';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
@@ -362,7 +362,7 @@ export class LoginComponent implements OnInit, OnDestroy {
         event.target.value = event.target.value.trim();
     }
 
-    getBackgroundUrlImageUrl() {
+    getBackgroundUrlImageUrl(): SafeStyle {
         return  this.sanitizer.bypassSecurityTrustStyle(`url(${this.backgroundImageUrl})`);
     }
 
diff --git a/lib/core/services/directionality-config.service.ts b/lib/core/services/directionality-config.service.ts
index 4b4289faf1..36e851f6a7 100644
--- a/lib/core/services/directionality-config.service.ts
+++ b/lib/core/services/directionality-config.service.ts
@@ -18,7 +18,7 @@
 import { Injectable, Inject, Renderer2, RendererFactory2 } from '@angular/core';
 import { Directionality, Direction } from '@angular/cdk/bidi';
 import { UserPreferencesService } from '../services/user-preferences.service';
-import { DOCUMENT } from '@angular/platform-browser';
+import { DOCUMENT } from '@angular/common';
 
 @Injectable({
     providedIn: 'root'
diff --git a/lib/core/services/search.service.ts b/lib/core/services/search.service.ts
index 33ce4e51d4..bfaa0b49cc 100644
--- a/lib/core/services/search.service.ts
+++ b/lib/core/services/search.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { NodePaging, QueryBody } from '@alfresco/js-api';
+import { NodePaging, QueryBody, ResultSetPaging } from '@alfresco/js-api';
 import { Observable, Subject, from, throwError } from 'rxjs';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { SearchConfigurationService } from './search-configuration.service';
@@ -26,7 +26,7 @@ import { SearchConfigurationService } from './search-configuration.service';
 })
 export class SearchService {
 
-    dataLoaded: Subject<NodePaging> = new Subject();
+    dataLoaded: Subject<ResultSetPaging> = new Subject();
 
     constructor(private apiService: AlfrescoApiService,
                 private searchConfigurationService: SearchConfigurationService) {
@@ -55,7 +55,7 @@ export class SearchService {
      * @param skipCount Number of higher-ranked items to skip over in the list
      * @returns List of search results
      */
-    search(searchTerm: string, maxResults: number, skipCount: number): Observable<NodePaging> {
+    search(searchTerm: string, maxResults: number, skipCount: number): Observable<ResultSetPaging> {
         const searchQuery = Object.assign(this.searchConfigurationService.generateQueryBody(searchTerm, maxResults, skipCount));
         const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);
 
@@ -71,7 +71,7 @@ export class SearchService {
      * @param queryBody Object containing the search parameters
      * @returns List of search results
      */
-    searchByQueryBody(queryBody: QueryBody): Observable<NodePaging> {
+    searchByQueryBody(queryBody: QueryBody): Observable<ResultSetPaging> {
         const promise = this.apiService.getInstance().search.searchApi.search(queryBody);
 
         promise.then((nodePaging: NodePaging) => {
diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.ts
index 152ec83179..6a8b0b1b92 100644
--- a/lib/process-services/src/lib/process-list/services/process-filter.service.ts
+++ b/lib/process-services/src/lib/process-list/services/process-filter.service.ts
@@ -20,6 +20,7 @@ import { Injectable } from '@angular/core';
 import { Observable, from, forkJoin, throwError } from 'rxjs';
 import { FilterProcessRepresentationModel } from '../models/filter-process.model';
 import { map, catchError } from 'rxjs/operators';
+import { ResultListDataRepresentationUserProcessInstanceFilterRepresentation } from '@alfresco/js-api';
 
 @Injectable({
     providedIn: 'root'
@@ -190,7 +191,7 @@ export class ProcessFilterService {
      * @param appId ID of the target app
      * @returns List of filter details
      */
-    callApiProcessFilters(appId?: number) {
+    callApiProcessFilters(appId?: number): Promise<ResultListDataRepresentationUserProcessInstanceFilterRepresentation> {
         if (appId) {
             return this.alfrescoApiService.getInstance().activiti.userFiltersApi.getUserProcessInstanceFilters({ appId: appId });
         } else {