diff --git a/cmd/tests.sh b/cmd/tests.sh
index 122c237..7e0cab0 100755
--- a/cmd/tests.sh
+++ b/cmd/tests.sh
@@ -267,8 +267,8 @@ test $(sqlite3 twitter.db "select count(*) from tweets where user_id = (select i
 
 
 # Test search
-#tw search "from:michaelmalice constitution"
-#test $(sqlite3 twitter.db "select count(*) from tweets where user_id = 44067298 and text like '%constitution%'") -gt "30"  # Not sure exactly how many
+tw search "from:michaelmalice constitution"
+test $(sqlite3 twitter.db "select count(*) from tweets where user_id = 44067298 and text like '%constitution%'") -gt "30"  # Not sure exactly how many
 
 
 # Test fetching a banned user
diff --git a/scraper/api_request_utils.go b/scraper/api_request_utils.go
index 3311a7f..5b84014 100644
--- a/scraper/api_request_utils.go
+++ b/scraper/api_request_utils.go
@@ -337,7 +337,7 @@ func (api API) GetMoreTweetsFromSearch(query string, response *TweetResponse, ma
 		if err != nil {
 			return err
 		}
-		if fresh_response.GetCursor() == last_response.GetCursor() && len(fresh_response.GlobalObjects.Tweets) == 0 {
+		if fresh_response.GetCursor() == last_response.GetCursor() || len(fresh_response.GlobalObjects.Tweets) == 0 {
 			// Empty response, cursor same as previous: end of feed has been reached
 			return END_OF_FEED
 		}