diff --git a/definitions/Firefox_Bookmarks.yaml b/definitions/Firefox_Bookmarks.yaml
index 64dff46..9d60f6b 100644
--- a/definitions/Firefox_Bookmarks.yaml
+++ b/definitions/Firefox_Bookmarks.yaml
@@ -65,7 +65,8 @@ Sources:
       dateAdded,
       lastModified
     FROM moz_annos
-    WHERE anno_attribute_id IN (1,2)
+    INNER JOIN moz_anno_attributes ON moz_annos.anno_attribute_id = moz_anno_attributes.id
+    WHERE moz_anno_attributes.name IN ('downloads/destinationFileURI','downloads/destinationFileName','downloads/metaData')
     ORDER BY moz_annos.dateAdded ASC
 
 - name: History