diff --git a/include/mastodont_search.h b/include/mastodont_search.h
index c6f14c1..4592a75 100644
--- a/include/mastodont_search.h
+++ b/include/mastodont_search.h
@@ -46,7 +46,8 @@ struct mstdnt_search_results
     size_t accts_len;
     struct mstdnt_status* statuses;
     size_t statuses_len;
-    // TODO tags
+    struct mstdnt_tag* tags;
+    size_t tags_len;
 };
 
 int mastodont_search(mastodont_t* data,
diff --git a/src/search.c b/src/search.c
index 9d3f6b0..4594818 100644
--- a/src/search.c
+++ b/src/search.c
@@ -54,9 +54,9 @@ int mstdnt_search_from_result(struct mstdnt_storage* storage,
                          &(search_results->accts_len),
                          accounts);
 
-    mstdnt_tags_json(&(search_results->accts),
-                     &(search_results->accts_len),
-                     accounts);
+    mstdnt_tags_json(&(search_results->tags),
+                     &(search_results->tags_len),
+                     hashtags);
     
     return 0;
 }