diff --git a/src/FilterLists.Web/ClientApp/components/Home.tsx b/src/FilterLists.Web/ClientApp/components/Home.tsx
index 4568530f9..ee267c288 100644
--- a/src/FilterLists.Web/ClientApp/components/Home.tsx
+++ b/src/FilterLists.Web/ClientApp/components/Home.tsx
@@ -103,6 +103,29 @@ export class Home extends React.Component<RouteComponentProps<{}>, IHomeState> {
                            sortMethod: (a: any, b: any) => a.toUpperCase() > b.toUpperCase() ? 1 : -1,
                            Cell: (cell: any) => <h2 className="mb-0">{cell.value}</h2>
                        },
+                       {
+                           Header: "Software",
+                           accessor: "softwareIds",
+                           filterable: true,
+                           filterMethod: (filter: any, row: any) => {
+                               if (filter.value === "any") {
+                                   return true;
+                               }
+                               return row[filter.id].join(",").split(",").includes(filter.value);
+                           },
+                           Filter: ({ filter, onChange }) =>
+                               <select
+                                   onChange={event => onChange(event.target.value)}
+                                   style={{ width: "100%" }}
+                                   value={filter ? filter.value : "all"}>
+                                   <option value="any">Any</option>
+                                   {state.software.map((e: any) => <option value={e.id}>{e.name}</option>)}
+                               </select>,
+                           Cell: () => null,
+                           width: 100,
+                           headerClassName: "d-none d-md-block",
+                           className: "d-none d-md-block"
+                       },
                        {
                            Header: "Tags",
                            accessor: "tags",
@@ -135,33 +158,6 @@ export class Home extends React.Component<RouteComponentProps<{}>, IHomeState> {
                            headerClassName: "d-none d-md-block",
                            className: "d-none d-md-block"
                        },
-                       {
-                           Header: "Software",
-                           accessor: "software",
-                           filterable: true,
-                           filterMethod: (filter: any, row: any) => {
-                               if (filter.value === "all") {
-                                   return true;
-                               }
-                               if (filter.value === "true") {
-                                   return row[filter.id] >= 21;
-                               }
-                               return row[filter.id] < 21;
-                           },
-                           Filter: ({ filter, onChange }) =>
-                               <select
-                                   onChange={event => onChange(event.target.value)}
-                                   style={{ width: "100%" }}
-                                   value={filter ? filter.value : "all"}>
-                                   {state.software.map((e: any) => <option value={e.id}>{e.name}</option>)}
-                               </select>,
-                           Cell: (cell: any) => <div className="fl-tag-container">{cell.value.map(
-                               (e: any) => <span className="badge badge-info">{e}</span>)}</div>,
-                           style: { whiteSpace: "inherit" },
-                           width: 150,
-                           headerClassName: "d-none d-md-block",
-                           className: "d-none d-md-block"
-                       },
                        {
                            Header: "Updated",
                            accessor: "updatedDate",