diff --git a/expenses_manager/expenses/forms.py b/expenses_manager/expenses/forms.py
index 3de8441..58f86d3 100644
--- a/expenses_manager/expenses/forms.py
+++ b/expenses_manager/expenses/forms.py
@@ -25,6 +25,7 @@ class ExpenseForm(forms.ModelForm):
         ]
         widgets = {
             'date': forms.DateInput(attrs={'type': 'date'}),
+            'widget': forms.CheckboxSelectMultiple(),
         }
 
 class TagForm(forms.ModelForm):
diff --git a/expenses_manager/expenses/templates/expenses/expense_list.html b/expenses_manager/expenses/templates/expenses/expense_list.html
index d801772..c74bb3d 100644
--- a/expenses_manager/expenses/templates/expenses/expense_list.html
+++ b/expenses_manager/expenses/templates/expenses/expense_list.html
@@ -76,7 +76,7 @@
                         <td>{{ expense.category.name }}</td>
                         <td>{{ expense.amount }}</td>
                         <td>
-                            {% for tag in expenses.tags.all %}
+                            {% for tag in expense.tags.all %}
                                 <span>{{ tag.name }}</span>{% if not forloop.last %}, {% endif %}
                             {% empty %}
                                 -