diff --git a/frontend/app/components/Dashboard/components/Funnels/FunnelIssues/FunnelIssues.tsx b/frontend/app/components/Dashboard/components/Funnels/FunnelIssues/FunnelIssues.tsx
index 41edff69e..da3c83c3f 100644
--- a/frontend/app/components/Dashboard/components/Funnels/FunnelIssues/FunnelIssues.tsx
+++ b/frontend/app/components/Dashboard/components/Funnels/FunnelIssues/FunnelIssues.tsx
@@ -23,6 +23,10 @@ function FunnelIssues() {
         
         const newFilter = {
             ...filter,
+            metricType: widget.metricType,
+            metricFormat: widget.metricFormat,
+            metricOf: widget.metricOf,
+            metricValue: widget.metricValue,
             series: filter.series.map((item: any) => {
                 return {
                     ...item,
diff --git a/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx b/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx
index 64135c551..707c91759 100644
--- a/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx
+++ b/frontend/app/components/shared/Filters/FilterItem/FilterItem.tsx
@@ -67,7 +67,7 @@ function FilterItem(props: Props) {
   return (
     <div className="flex items-center hover:bg-active-blue -mx-5 px-5 py-2">
       <div className="flex items-start w-full">
-        {!isFilter && !hideIndex && !!filterIndex && (
+        {!isFilter && !hideIndex && filterIndex >= 0 && (
           <div
             className="mt-1 flex-shrink-0 border w-6 h-6 text-xs flex items-center justify-center rounded-full bg-gray-light-shade mr-2">
             <span>{filterIndex + 1}</span>