diff --git a/dive.c b/dive.c
index 5705921fc..126453bed 100644
--- a/dive.c
+++ b/dive.c
@@ -2507,8 +2507,13 @@ int count_dives_with_tag(const char *tag)
 	struct dive *d;
 
 	for_each_dive (i, d) {
-		if (taglist_contains(d->tag_list, tag))
+		if (same_string(tag, "")) {
+			// count dives with no tags
+			if (d->tag_list == NULL)
+				counter++;
+		} else if (taglist_contains(d->tag_list, tag)) {
 			counter++;
+		}
 	}
 	return counter;
 }
@@ -2522,8 +2527,13 @@ int count_dives_with_person(const char *person)
 	struct dive *d;
 
 	for_each_dive (i, d) {
-		if (string_sequence_contains(d->buddy, person) || string_sequence_contains(d->divemaster, person))
+		if (same_string(person, "")) {
+			// solo dive
+			if (same_string(d->buddy, "") && same_string(d->divemaster, ""))
+				counter++;
+		} else if (string_sequence_contains(d->buddy, person) || string_sequence_contains(d->divemaster, person)) {
 			counter++;
+		}
 	}
 	return counter;
 }
diff --git a/qt-ui/filtermodels.cpp b/qt-ui/filtermodels.cpp
index 2f19233e1..ae98e5ce4 100644
--- a/qt-ui/filtermodels.cpp
+++ b/qt-ui/filtermodels.cpp
@@ -51,7 +51,7 @@ QVariant CLASS::data(const QModelIndex &index, int role) const \
 		return checkState[index.row()] ? Qt::Checked : Qt::Unchecked; \
 	} else if (role == Qt::DisplayRole) { \
 		QString value = stringList()[index.row()]; \
-		int count = COUNTER_FUNCTION(value.toUtf8().data()); \
+		int count = COUNTER_FUNCTION((index.row() == rowCount() - 1) ? "" : value.toUtf8().data()); \
 		return value + QString(" (%1)").arg(count); \
 	} \
 	return QVariant(); \