From 20fa3915b8b7400392905ac598d85048c9e1f11a Mon Sep 17 00:00:00 2001
From: Jorni Cornelese <40827393+jornicornelese@users.noreply.github.com>
Date: Tue, 24 May 2022 12:00:58 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20multiple=20taxonomies=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Http/Resources/CP/Concerns/HasRequestedColumns.php | 3 ++-
 src/Http/Resources/CP/Taxonomies/ListedTerm.php        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
index f0845f4c59..f796eab78f 100644
--- a/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
+++ b/src/Http/Resources/CP/Concerns/HasRequestedColumns.php
@@ -23,9 +23,10 @@ protected function visibleColumns()
 
         return collect($requested)
             ->map(function ($field) use ($columns) {
-                return $columns->get($field)->visible(true);
+                return $columns->get($field)?->visible(true);
             })
             ->merge($columns->except($requested))
+            ->filter()
             ->values();
     }
 
diff --git a/src/Http/Resources/CP/Taxonomies/ListedTerm.php b/src/Http/Resources/CP/Taxonomies/ListedTerm.php
index 9f1a94f07d..c60e6a3ca6 100644
--- a/src/Http/Resources/CP/Taxonomies/ListedTerm.php
+++ b/src/Http/Resources/CP/Taxonomies/ListedTerm.php
@@ -36,7 +36,7 @@ public function toArray($request)
             'private' => $term->private(),
 
             $this->merge($this->values([
-                'title' => $term->title(),
+                'title' => $term->taxonomy()->title() .' - '.  $term->title(),
                 'slug' => $term->slug(),
             ])),