diff --git a/src/admin/query/account_data.rs b/src/admin/query/account_data.rs
index 290d5a04..9f5b1482 100644
--- a/src/admin/query/account_data.rs
+++ b/src/admin/query/account_data.rs
@@ -18,10 +18,9 @@ pub(super) async fn account_data(subcommand: AccountData) -> Result<RoomMessageE
 				.changes_since(room_id.as_deref(), &user_id, since)?;
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		AccountData::Get {
 			user_id,
@@ -35,10 +34,9 @@ pub(super) async fn account_data(subcommand: AccountData) -> Result<RoomMessageE
 				.get(room_id.as_deref(), &user_id, kind)?;
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/appservice.rs b/src/admin/query/appservice.rs
index a94f22b8..7331462a 100644
--- a/src/admin/query/appservice.rs
+++ b/src/admin/query/appservice.rs
@@ -16,20 +16,18 @@ pub(super) async fn appservice(subcommand: Appservice) -> Result<RoomMessageEven
 				.get_registration(appservice_id.as_ref());
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Appservice::All => {
 			let timer = tokio::time::Instant::now();
 			let results = services().appservice.db.all();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/globals.rs b/src/admin/query/globals.rs
index bc8bcdef..2e22d688 100644
--- a/src/admin/query/globals.rs
+++ b/src/admin/query/globals.rs
@@ -11,40 +11,36 @@ pub(super) async fn globals(subcommand: Globals) -> Result<RoomMessageEventConte
 			let results = services().globals.db.database_version();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Globals::CurrentCount => {
 			let timer = tokio::time::Instant::now();
 			let results = services().globals.db.current_count();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Globals::LastCheckForUpdatesId => {
 			let timer = tokio::time::Instant::now();
 			let results = services().globals.db.last_check_for_updates_id();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Globals::LoadKeypair => {
 			let timer = tokio::time::Instant::now();
 			let results = services().globals.db.load_keypair();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Globals::SigningKeysFor {
 			origin,
@@ -53,10 +49,9 @@ pub(super) async fn globals(subcommand: Globals) -> Result<RoomMessageEventConte
 			let results = services().globals.db.signing_keys_for(&origin);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/presence.rs b/src/admin/query/presence.rs
index c54cad63..bd853ada 100644
--- a/src/admin/query/presence.rs
+++ b/src/admin/query/presence.rs
@@ -13,10 +13,9 @@ pub(super) async fn presence(subcommand: Presence) -> Result<RoomMessageEventCon
 			let results = services().presence.db.get_presence(&user_id)?;
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		Presence::PresenceSince {
 			since,
@@ -27,10 +26,9 @@ pub(super) async fn presence(subcommand: Presence) -> Result<RoomMessageEventCon
 
 			let presence_since: Vec<(_, _, _)> = results.collect();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{presence_since:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{presence_since:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{presence_since:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/room_alias.rs b/src/admin/query/room_alias.rs
index eaca285e..3262303a 100644
--- a/src/admin/query/room_alias.rs
+++ b/src/admin/query/room_alias.rs
@@ -13,10 +13,9 @@ pub(super) async fn room_alias(subcommand: RoomAlias) -> Result<RoomMessageEvent
 			let results = services().rooms.alias.db.resolve_local_alias(&alias);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomAlias::LocalAliasesForRoom {
 			room_id,
@@ -27,10 +26,9 @@ pub(super) async fn room_alias(subcommand: RoomAlias) -> Result<RoomMessageEvent
 
 			let aliases: Vec<_> = results.collect();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{aliases:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{aliases:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{aliases:#?}\n```"
+			)))
 		},
 		RoomAlias::AllLocalAliases => {
 			let timer = tokio::time::Instant::now();
@@ -39,10 +37,9 @@ pub(super) async fn room_alias(subcommand: RoomAlias) -> Result<RoomMessageEvent
 
 			let aliases: Vec<_> = results.collect();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{aliases:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{aliases:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{aliases:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/room_state_cache.rs b/src/admin/query/room_state_cache.rs
index 63cf355f..aed2b4a2 100644
--- a/src/admin/query/room_state_cache.rs
+++ b/src/admin/query/room_state_cache.rs
@@ -16,10 +16,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.server_in_room(&server, &room_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{result:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{result:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{result:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomServers {
 			room_id,
@@ -32,10 +31,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::ServerRooms {
 			server,
@@ -44,10 +42,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 			let results: Result<Vec<_>> = services().rooms.state_cache.server_rooms(&server).collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomMembers {
 			room_id,
@@ -60,10 +57,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::LocalUsersInRoom {
 			room_id,
@@ -76,10 +72,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::ActiveLocalUsersInRoom {
 			room_id,
@@ -92,10 +87,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomJoinedCount {
 			room_id,
@@ -104,10 +98,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 			let results = services().rooms.state_cache.room_joined_count(&room_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomInvitedCount {
 			room_id,
@@ -116,10 +109,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 			let results = services().rooms.state_cache.room_invited_count(&room_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomUserOnceJoined {
 			room_id,
@@ -132,10 +124,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomMembersInvited {
 			room_id,
@@ -148,10 +139,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::GetInviteCount {
 			room_id,
@@ -164,10 +154,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.get_invite_count(&room_id, &user_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::GetLeftCount {
 			room_id,
@@ -180,10 +169,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.get_left_count(&room_id, &user_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomsJoined {
 			user_id,
@@ -196,10 +184,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomsInvited {
 			user_id,
@@ -212,10 +199,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::RoomsLeft {
 			user_id,
@@ -224,10 +210,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 			let results: Result<Vec<_>> = services().rooms.state_cache.rooms_left(&user_id).collect();
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 		RoomStateCache::InviteState {
 			user_id,
@@ -240,10 +225,9 @@ pub(super) async fn room_state_cache(subcommand: RoomStateCache) -> Result<RoomM
 				.invite_state(&user_id, &room_id);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/sending.rs b/src/admin/query/sending.rs
index 8c52b45f..9690f8f6 100644
--- a/src/admin/query/sending.rs
+++ b/src/admin/query/sending.rs
@@ -13,10 +13,9 @@ pub(super) async fn sending(subcommand: Sending) -> Result<RoomMessageEventConte
 
 			let active_requests: Result<Vec<(_, _, _)>> = results.collect();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{active_requests:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{active_requests:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{active_requests:#?}\n```"
+			)))
 		},
 		Sending::QueuedRequests {
 			appservice_id,
@@ -92,10 +91,9 @@ pub(super) async fn sending(subcommand: Sending) -> Result<RoomMessageEventConte
 
 			let queued_requests = results.collect::<Result<Vec<(_, _)>>>();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{queued_requests:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{queued_requests:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{queued_requests:#?}\n```"
+			)))
 		},
 		Sending::ActiveRequestsFor {
 			appservice_id,
@@ -171,10 +169,9 @@ pub(super) async fn sending(subcommand: Sending) -> Result<RoomMessageEventConte
 
 			let active_requests = results.collect::<Result<Vec<(_, _)>>>();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{active_requests:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{active_requests:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{active_requests:#?}\n```"
+			)))
 		},
 		Sending::GetLatestEduCount {
 			server_name,
@@ -183,10 +180,9 @@ pub(super) async fn sending(subcommand: Sending) -> Result<RoomMessageEventConte
 			let results = services().sending.db.get_latest_educount(&server_name);
 			let query_time = timer.elapsed();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{results:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{results:#?}\n```"
+			)))
 		},
 	}
 }
diff --git a/src/admin/query/users.rs b/src/admin/query/users.rs
index 7f0980ae..8f88808a 100644
--- a/src/admin/query/users.rs
+++ b/src/admin/query/users.rs
@@ -13,10 +13,9 @@ pub(super) async fn users(subcommand: Users) -> Result<RoomMessageEventContent>
 
 			let users = results.collect::<Vec<_>>();
 
-			Ok(RoomMessageEventContent::text_html(
-				format!("Query completed in {query_time:?}:\n\n```\n{users:?}```"),
-				format!("<p>Query completed in {query_time:?}:</p>\n<pre><code>{users:?}\n</code></pre>"),
-			))
+			Ok(RoomMessageEventContent::notice_markdown(format!(
+				"Query completed in {query_time:?}:\n\n```rs\n{users:#?}\n```"
+			)))
 		},
 	}
 }