app/Desktop/Common/NumberValueConverter.cs

@@ -5,7 +5,7 @@ using Avalonia.Data.Converters;
 namespace DHT.Desktop.Common {
 	sealed class NumberValueConverter : IValueConverter {
 		public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
-			return value == null ? "-" : string.Format(Program.Culture, "{0:n0}", value);
+			return string.Format(Program.Culture, "{0:n0}", value);
 		}
 
 		public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) {

app/Desktop/Main/Pages/DatabasePageModel.cs

@@ -92,8 +92,6 @@ namespace DHT.Desktop.Main.Pages {
 			}
 
 			var oldStatistics = target.Statistics.Clone();
-			var oldMessageCount = target.CountMessages();
-
 			int successful = 0;
 			int finished = 0;
 
@@ -134,7 +132,7 @@ namespace DHT.Desktop.Main.Pages {
 			var newStatistics = target.Statistics;
 			long newServers = newStatistics.TotalServers - oldStatistics.TotalServers;
 			long newChannels = newStatistics.TotalChannels - oldStatistics.TotalChannels;
-			long newMessages = target.CountMessages() - oldMessageCount;
+			long newMessages = newStatistics.TotalMessages - oldStatistics.TotalMessages;
 
 			StringBuilder message = new StringBuilder();
 			message.Append("Processed ");

app/Desktop/Main/Pages/ViewerPageModel.cs

@@ -35,7 +35,7 @@ namespace DHT.Desktop.Main.Pages {
 		private readonly IDatabaseFile db;
 
 		private bool isPageVisible = false;
-
+		
 		[Obsolete("Designer")]
 		public ViewerPageModel() : this(null!, DummyDatabaseFile.Instance) {}
 
@@ -46,6 +46,7 @@ namespace DHT.Desktop.Main.Pages {
 			FilterModel = new FilterPanelModel(window, db);
 			FilterModel.FilterPropertyChanged += OnFilterPropertyChanged;
 			db.Statistics.PropertyChanged += OnDbStatisticsChanged;
+			UpdateStatistics();
 		}
 
 		public void Dispose() {
@@ -72,17 +73,13 @@ namespace DHT.Desktop.Main.Pages {
 		}
 
 		private void UpdateStatistics() {
-			var filter = FilterModel.CreateFilter();
+			ExportedMessageText = "Will export " + db.CountMessages(FilterModel.CreateFilter()).Format() + " out of " + db.Statistics.TotalMessages.Format() + " message(s).";
-			var allMessagesCount = db.Statistics.TotalMessages?.Format() ?? "?";
-			var filteredMessagesCount = filter.IsEmpty ? allMessagesCount : db.CountMessages(filter).Format();
-
-			ExportedMessageText = "Will export " + filteredMessagesCount + " out of " + allMessagesCount + " message(s).";
 			OnPropertyChanged(nameof(ExportedMessageText));
 		}
 
 		private async Task<string> GenerateViewerContents() {
 			string json = ViewerJsonExport.Generate(db, FilterModel.CreateFilter());
-
+			
 			string index = await Resources.ReadTextAsync("Viewer/index.html");
 			string viewer = index.Replace("/*[JS]*/", await Resources.ReadJoinedAsync("Viewer/scripts/", '\n'))
 			                     .Replace("/*[CSS]*/", await Resources.ReadJoinedAsync("Viewer/styles/", '\n'))

app/Server/Data/Filters/MessageFilter.cs

@@ -3,17 +3,11 @@ using System.Collections.Generic;
 
 namespace DHT.Server.Data.Filters {
 	public sealed class MessageFilter {
-		public DateTime? StartDate { get; set; } = null;
+		public DateTime? StartDate { get; set; }
-		public DateTime? EndDate { get; set; } = null;
+		public DateTime? EndDate { get; set; }
 
 		public HashSet<ulong>? ChannelIds { get; set; } = null;
 		public HashSet<ulong>? UserIds { get; set; } = null;
 		public HashSet<ulong>? MessageIds { get; set; } = null;
-
-		public bool IsEmpty => StartDate == null &&
-		                       EndDate == null &&
-		                       ChannelIds == null &&
-		                       UserIds == null &&
-		                       MessageIds == null;
 	}
 }

app/Server/Database/DatabaseStatistics.cs

@@ -5,7 +5,7 @@ namespace DHT.Server.Database {
 		private long totalServers;
 		private long totalChannels;
 		private long totalUsers;
-		private long? totalMessages;
+		private long totalMessages;
 
 		public long TotalServers {
 			get => totalServers;
@@ -22,7 +22,7 @@ namespace DHT.Server.Database {
 			internal set => Change(ref totalUsers, value);
 		}
 
-		public long? TotalMessages {
+		public long TotalMessages {
 			get => totalMessages;
 			internal set => Change(ref totalMessages, value);
 		}

app/Server/Database/Sqlite/SqliteDatabaseFile.cs

@@ -46,13 +46,11 @@ namespace DHT.Server.Database.Sqlite {
 			this.Path = path;
 			this.Statistics = new DatabaseStatistics();
 
-			using (var conn = pool.Take()) {
+			using var conn = pool.Take();
-				UpdateServerStatistics(conn);
+			UpdateServerStatistics(conn);
-				UpdateChannelStatistics(conn);
+			UpdateChannelStatistics(conn);
-				UpdateUserStatistics(conn);
+			UpdateUserStatistics(conn);
-			}
+			UpdateMessageStatistics(conn);
-
-			messageStatisticsThread.RequestUpdate();
 		}
 
 		public void Dispose() {