diff --git a/config.json b/config.json
index e55900891be70e88b4bf7fcf29846d22117ec244..9e85cd7024c398d4191184eaf71d8821cd03a312 100644
--- a/config.json
+++ b/config.json
@@ -5,7 +5,7 @@   "connect_protocol_via_main_proxy": "https",
   "i2p_http_proxy_addr": "http://127.0.0.1:4444",
   "tor_proxy_addr": "socks5://127.0.0.1:9050",
   "max_statuses": 40,
-  "per_status_mode": false,
+  "per_status_mode": true,
   "enabled_nsfw": true,
   "nsfw_only": false,
   "hide_reblogs": false,
diff --git a/pleroma-cli.sh b/pleroma-cli.sh
index 876fad2cf5c87a01483f979b4aaca5655c2ce500..452904824ffd3e0e6329d45efcf6a8de5b5655bb 100755
--- a/pleroma-cli.sh
+++ b/pleroma-cli.sh
@@ -622,7 +622,11 @@ search_api_statuses()
 {
 	echo "Input query:"
 	read query
-	results=$(default_curl_opt "$instance_point/search?q=$query&type=statuses" | jj 'statuses')
+	results=$(default_curl_opt --get \
+		--data-urlencode "q=$query" \
+		--data-urlencode 'type=statuses' \
+		--data-urlencode "limit=$max_statuses" \
+		"$instance_point/search" | jj 'statuses')
 	timeline='search' timeline_menu
 }