diff --git a/src/components/shopping/CurrentShoppingListPage.vue b/src/components/shopping/CurrentShoppingListPage.vue
index db445fe..67dcc53 100644
--- a/src/components/shopping/CurrentShoppingListPage.vue
+++ b/src/components/shopping/CurrentShoppingListPage.vue
@@ -154,8 +154,8 @@ async function saveShoppingList(outstandingItemGroups) {
 }
 
 const groupsMatch = (a, b) => {
-    if (a.product != b.product) return false;
-    if (a.name && a.name === b.name) return true;
+    if (!!a.product != !!b.product) return false;
+    if (a.name) return a.name === b.name;
     return a.product.id === b.product.id;
 }
 
diff --git a/src/components/shopping/ShoppingListItem.vue b/src/components/shopping/ShoppingListItem.vue
index 1415d2e..c2e7442 100644
--- a/src/components/shopping/ShoppingListItem.vue
+++ b/src/components/shopping/ShoppingListItem.vue
@@ -6,7 +6,7 @@
     <div class="product-details">
         <h3 class="header">
             <strong>
-                <a v-if="shoppingListItemGroup.product?.link" :href="shoppingListItemGroup.product?.link">{{ shoppingListItemGroup.product.name }}</a>
+                <a v-if="shoppingListItemGroup.product?.link" :href="shoppingListItemGroup.product?.link">{{ shoppingListItemGroup.product?.name }}</a>
                 <span v-else>{{ shoppingListItemGroup.name }}</span>
             </strong>, 
             <small>