diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts index 360a88af89..e281c4bae4 100644 --- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts +++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts @@ -42,10 +42,10 @@ export class CfServicesDataSource extends ListDataSource { }] ) - const labels = filterByLabel(entities, paginationState) - const tags = filterByTags(entities, paginationState) + const filteredByLabel = filterByLabel(entities, paginationState) + const filteredByTagsAndLabel = filterByTags(filteredByLabel, paginationState) - return [...labels, ...tags] + return filteredByTagsAndLabel }, (entities: APIResource[], paginationState: PaginationEntityState) => { const cfGuid = paginationState.clientPagination.filter.items.cf;