Bookmarks: Internal tags have a dot prefix

Internal behavior tags are now written in bookmarks.ini with a dot prefix (like hidden files on Unix), and at runtime they are removed from the tags string.

This makes things more efficient as it isn't necessary to compile regular expressions all the time.

TODO: Add "Edit Feed..." into the Bookmarks context menu, and a new menu item for listing all subscriptions.

IssueID #331

7 files changed, 204 insertions, 131 deletions

diff --git a/src/app.c b/src/app.c
index a2de03ca..0c6e38f1 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2980,10 +2980,8 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "navigate.home")) {
         /* Look for bookmarks tagged "homepage". */
-        iRegExp *pattern = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b",
-                                            caseInsensitive_RegExpOption));
         const iPtrArray *homepages =
-            list_Bookmarks(d->bookmarks, NULL, filterTagsRegExp_Bookmarks, pattern);
+            list_Bookmarks(d->bookmarks, NULL, filterHomepage_Bookmark, NULL);
         if (isEmpty_PtrArray(homepages)) {
             postCommand_Root(get_Root(), "open url:about:lagrange");
         }
diff --git a/src/bookmarks.c b/src/bookmarks.c
index d4b20162..2606d975 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -37,6 +37,7 @@ void init_Bookmark(iBookmark *d) {
     init_String(&d->url);
     init_String(&d->title);
     init_String(&d->tags);
+    iZap(d->flags);
     iZap(d->when);
     d->parentId = 0;
     d->order = 0;
@@ -48,6 +49,7 @@ void deinit_Bookmark(iBookmark *d) {
     deinit_String(&d->url);
 }
 
+#if 0
 iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
     if (!d) return iFalse;
     iRegExp *pattern = new_RegExp(format_CStr("\\b%s\\b", tag), caseSensitive_RegExpOption);
@@ -60,7 +62,7 @@ iBool hasTag_Bookmark(const iBookmark *d, const char *tag) {
 
 void addTag_Bookmark(iBookmark *d, const char *tag) {
     if (!isEmpty_String(&d->tags)) {
-        appendChar_String(&d->tags, ' ');
+        appendCStr_String(&d->tags, " ");
     }
     appendCStr_String(&d->tags, tag);
 }
@@ -72,6 +74,93 @@ void removeTag_Bookmark(iBookmark *d, const char *tag) {
         trim_String(&d->tags);
     }
 }
+#endif
+
+static struct {
+    uint32_t    bit;
+    const char *tag;
+    iRegExp *   pattern;
+    iRegExp *   oldPattern;
+}
+specialTags_[] = {
+    { homepage_BookmarkFlag, ".homepage" },
+    { remoteSource_BookmarkFlag, ".remotesource" },
+    { linkSplit_BookmarkFlag, ".linksplit" },
+    { userIcon_BookmarkFlag, ".usericon" },
+    { subscribed_BookmarkFlag, ".subscribed" },
+    { headings_BookmarkFlag, ".headings" },
+    { ignoreWeb_BookmarkFlag, ".ignoreweb" },
+    /* `remote_BookmarkFlag` not included because it's runtime only */
+};
+
+static void updatePatterns_(size_t index) {
+    if (!specialTags_[index].pattern) {
+        specialTags_[index].pattern = new_RegExp(format_CStr("(?<!\\w)\\%s\\b(?!\\w)",
+                                                             specialTags_[index].tag),
+                                                 caseSensitive_RegExpOption); /* never released */
+    }
+    if (!specialTags_[index].oldPattern) {
+        /* TODO: Get rid of these when compatibility with v1.9 or older is not important. */
+        specialTags_[index].oldPattern =
+            new_RegExp(format_CStr("\\b%s\\b", specialTags_[index].tag + 1), /* dotless */
+                       caseSensitive_RegExpOption); /* never released */
+    }
+}
+
+static void normalizeSpacesInTags_(iString *tags) {
+    iBool wasSpace = iFalse;
+    iString out;
+    init_String(&out);
+    for (const char *ch = constBegin_String(tags); ch != constEnd_String(tags); ch++) {
+        if (*ch == ' ') {
+            if (!wasSpace) {
+                wasSpace = iTrue;
+            }
+            else {
+                continue;
+            }
+        }
+        else {
+            wasSpace = iFalse;
+        }
+        appendData_Block(&out.chars, ch, 1);
+    }
+    trim_String(&out);
+    set_String(tags, &out);
+    deinit_String(&out);
+}
+
+static void unpackDotTags_Bookmark_(iBookmark *d) {
+    iZap(d->flags);
+    iForIndices(i, specialTags_) {
+        updatePatterns_(i);
+        iRegExpMatch m;
+        init_RegExpMatch(&m);
+        iBool isSet = matchString_RegExp(specialTags_[i].pattern, &d->tags, &m);
+        if (!isSet) {
+            init_RegExpMatch(&m);
+            isSet = matchString_RegExp(specialTags_[i].oldPattern, &d->tags, &m);
+        }
+        iChangeFlags(d->flags, specialTags_[i].bit, isSet);
+        if (isSet) {
+            remove_Block(&d->tags.chars, m.range.start, size_Range(&m.range));
+        }
+    }
+    normalizeSpacesInTags_(&d->tags);
+}
+
+static iString *packedDotTags_Bookmark_(const iBookmark *d) {
+    iString *withDot = copy_String(&d->tags);
+    iForIndices(i, specialTags_) {
+        if (d->flags & specialTags_[i].bit) {
+            if (!isEmpty_String(withDot)) {
+                appendCStr_String(withDot, " ");
+            }
+            appendCStr_String(withDot, specialTags_[i].tag);
+        }
+    }
+    return withDot;
+}
 
 iDefineTypeConstruction(Bookmark)
 
@@ -176,6 +265,7 @@ static void loadOldFormat_Bookmarks(iBookmarks *d, const char *dirPath) {
             setRange_String(&bm->title, line);
             nextSplit_Rangecc(src, "\n", &line);
             setRange_String(&bm->tags, line);
+            unpackDotTags_Bookmark_(bm);
             insert_Bookmarks_(d, bm);
         }
     }
@@ -220,6 +310,10 @@ static void handleKeyValue_BookmarkLoader_(void *context, const iString *table,
         }
         else if (!cmp_String(key, "tags") && tv->type == string_TomlType) {
             set_String(&bm->tags, tv->value.string);
+            if (strstr(cstr_String(&bm->tags), "subscribed")) {
+                printf("a\n");
+            }
+            unpackDotTags_Bookmark_(bm);
         }
         else if (!cmp_String(key, "icon") && tv->type == int64_TomlType) {
             bm->icon = (iChar) tv->value.int64;
@@ -292,7 +386,6 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
 
 void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
     lock_Mutex(d->mtx);
-    iRegExp *remotePattern = iClob(new_RegExp("\\bremote\\b", caseSensitive_RegExpOption));
     iFile *f = newCStr_File(concatPath_CStr(dirPath, fileName_Bookmarks_));
     if (open_File(f, writeOnly_FileMode | text_FileMode)) {        
         iString *str = collectNew_String();
@@ -300,13 +393,12 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
         writeData_File(f, cstr_String(str), size_String(str));
         iConstForEach(Hash, i, &d->bookmarks) {
             const iBookmark *bm = (const iBookmark *) i.value;
-            iRegExpMatch m;
-            init_RegExpMatch(&m);
-            if (matchString_RegExp(remotePattern, &bm->tags, &m)) {
+            if (bm->flags & remote_BookmarkFlag) {
                 /* Remote bookmarks are not saved. */
                 continue;
             }
             iBeginCollect();
+            const iString *packedTags = collect_String(packedDotTags_Bookmark_(bm));
             format_String(str,
                           "[%d]\n"
                           "url = \"%s\"\n"
@@ -317,7 +409,7 @@ void save_Bookmarks(const iBookmarks *d, const char *dirPath) {
                           id_Bookmark(bm),
                           cstrCollect_String(quote_String(&bm->url, iFalse)),
                           cstrCollect_String(quote_String(&bm->title, iFalse)),
-                          cstrCollect_String(quote_String(&bm->tags, iFalse)),
+                          cstrCollect_String(quote_String(packedTags, iFalse)),
                           bm->icon,
                           seconds_Time(&bm->when),
                           cstrCollect_String(format_Time(&bm->when, "%Y-%m-%d")));
@@ -397,7 +489,7 @@ iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon
     const uint32_t id = findUrl_Bookmarks(d, url);
     if (id) {
         iBookmark *bm = get_Bookmarks(d, id);
-        if (!hasTag_Bookmark(bm, remote_BookmarkTag) && !hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+        if (~bm->flags & remote_BookmarkFlag && ~bm->flags & userIcon_BookmarkFlag) {
             if (icon != bm->icon) {
                 bm->icon = icon;
                 changed = iTrue;
@@ -422,19 +514,13 @@ iChar siteIcon_Bookmarks(const iBookmarks *d, const iString *url) {
     if (isEmpty_String(url)) {
         return 0;
     }
-    static iRegExp *tagPattern_;
-    if (!tagPattern_) {
-        tagPattern_ = new_RegExp("\\b" userIcon_BookmarkTag "\\b", caseSensitive_RegExpOption);
-    }
     const iRangecc urlRoot      = urlRoot_String(url);
     size_t         matchingSize = iInvalidSize; /* we'll pick the shortest matching */
     iChar          icon         = 0;
     lock_Mutex(d->mtx);
     iConstForEach(Hash, i, &d->bookmarks) {
         const iBookmark *bm = (const iBookmark *) i.value;
-        iRegExpMatch m;
-        init_RegExpMatch(&m);
-        if (bm->icon && matchString_RegExp(tagPattern_, &bm->tags, &m)) {
+        if (bm->icon && bm->flags & userIcon_BookmarkFlag) {
             const iRangecc bmRoot = urlRoot_String(&bm->url);
             if (equalRangeCase_Rangecc(urlRoot, bmRoot)) {
                 const size_t n = size_String(&bm->url);
@@ -467,10 +553,15 @@ void reorder_Bookmarks(iBookmarks *d, uint32_t id, int newOrder) {
     unlock_Mutex(d->mtx);
 }
 
-iBool filterTagsRegExp_Bookmarks(void *regExp, const iBookmark *bm) {
-    iRegExpMatch m;
-    init_RegExpMatch(&m);
-    return matchString_RegExp(regExp, &bm->tags, &m);
+//iBool filterTagsRegExp_Bookmarks(void *regExp, const iBookmark *bm) {
+//    iRegExpMatch m;
+//    init_RegExpMatch(&m);
+//    return matchString_RegExp(regExp, &bm->tags, &m);
+//}
+
+iBool filterHomepage_Bookmark(void *d, const iBookmark *bm) {
+    iUnused(d);
+    return (bm->flags & homepage_BookmarkFlag) != 0;
 }
 
 static iBool matchUrl_(void *url, const iBookmark *bm) {
@@ -618,7 +709,7 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
 
 static iBool isRemoteSource_Bookmark_(void *context, const iBookmark *d) {
     iUnused(context);
-    return hasTag_Bookmark(d, remoteSource_BookmarkTag);
+    return (d->flags & remoteSource_BookmarkFlag) != 0;
 }
 
 void remoteRequestFinished_Bookmarks_(iBookmarks *d, iGmRequest *req) {
@@ -642,7 +733,6 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
         initCurrent_Time(&now);
         iRegExp *linkPattern = new_RegExp("^=>\\s*([^\\s]+)(\\s+(.*))?", 0);
         iString src;
-        const iString *remoteTag = collectNewCStr_String("remote");
         initBlock_String(&src, body_GmRequest(req));
         iRangecc srcLine = iNullRange;
         while (nextSplit_Rangecc(range_String(&src), "\n", &srcLine)) {
@@ -660,8 +750,9 @@ void requestFinished_Bookmarks(iBookmarks *d, iGmRequest *req) {
                     if (isEmpty_String(titleStr)) {
                         setRange_String(titleStr, urlHost_String(urlStr));
                     }
-                    const uint32_t bmId = add_Bookmarks(d, absUrl, titleStr, remoteTag, 0x2913);
+                    const uint32_t bmId = add_Bookmarks(d, absUrl, titleStr, NULL, 0x2913);
                     iBookmark *bm = get_Bookmarks(d, bmId);
+                    bm->flags |= remote_BookmarkFlag;
                     bm->parentId = *(uint32_t *) userData_Object(req);
                     delete_String(titleStr);
                 }
@@ -690,7 +781,7 @@ void fetchRemote_Bookmarks(iBookmarks *d) {
         size_t numRemoved = 0;
         iForEach(Hash, i, &d->bookmarks) {
             iBookmark *bm = (iBookmark *) i.value;
-            if (hasTag_Bookmark(bm, remote_BookmarkTag)) {
+            if (bm->flags & remote_BookmarkFlag) {
                 remove_HashIterator(&i);
                 delete_Bookmark(bm);
                 numRemoved++;
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 6cb5c8a9..08afdd8b 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -31,27 +31,30 @@ iDeclareType(GmRequest)
 
 iDeclareType(Bookmark)
 iDeclareTypeConstruction(Bookmark)
-
-/* TODO: Make the special internal tags a bitfield, separate from user's tags. */
-
-#define headings_BookmarkTag        "headings"
-#define ignoreWeb_BookmarkTag       "ignoreweb"
-#define homepage_BookmarkTag        "homepage"
-#define linkSplit_BookmarkTag       "linksplit"
-#define remote_BookmarkTag          "remote"
-#define remoteSource_BookmarkTag    "remotesource"
-#define subscribed_BookmarkTag      "subscribed"
-#define userIcon_BookmarkTag        "usericon"
+    
+/* These values are not serialized as-is in bookmarks.ini. Instead, they are included in `tags`
+   with a dot prefix. This helps retain backwards and forwards compatibility. */
+enum iBookmarkFlags {
+    homepage_BookmarkFlag     = iBit(1),
+    remoteSource_BookmarkFlag = iBit(2),
+    linkSplit_BookmarkFlag    = iBit(3),
+    userIcon_BookmarkFlag     = iBit(4),
+    subscribed_BookmarkFlag   = iBit(17),
+    headings_BookmarkFlag     = iBit(18),
+    ignoreWeb_BookmarkFlag    = iBit(19),
+    remote_BookmarkFlag       = iBit(31),
+};
 
 struct Impl_Bookmark {
     iHashNode node;
-    iString url;
-    iString title;
-    iString tags;
-    iChar icon;
-    iTime when;
-    uint32_t parentId; /* remote source or folder */
-    int order;         /* sort order */
+    iString   url;
+    iString   title;
+    iString   tags;
+    uint32_t  flags;
+    iChar     icon;
+    iTime     when;
+    uint32_t  parentId; /* remote source or folder */
+    int       order;    /* sort order */
 };
 
 iLocalDef uint32_t  id_Bookmark         (const iBookmark *d) { return d->node.key; }
@@ -59,23 +62,24 @@ iLocalDef iBool     isFolder_Bookmark   (const iBookmark *d) { return isEmpty_St
 
 iBool   hasParent_Bookmark  (const iBookmark *, uint32_t parentId);
 int     depth_Bookmark      (const iBookmark *);
-iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
-void    addTag_Bookmark     (iBookmark *, const char *tag);
-void    removeTag_Bookmark  (iBookmark *, const char *tag);
-
-iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
-    if (!hasTag_Bookmark(d, tag)) {
-        addTag_Bookmark(d, tag);
-    }
-}
-iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
-    if (add) {
-        addTagIfMissing_Bookmark(d, tag);
-    }
-    else {
-        removeTag_Bookmark(d, tag);
-    }
-}
+
+//iBool   hasTag_Bookmark     (const iBookmark *, const char *tag);
+//void    addTag_Bookmark     (iBookmark *, const char *tag);
+//void    removeTag_Bookmark  (iBookmark *, const char *tag);
+
+//iLocalDef void addTagIfMissing_Bookmark(iBookmark *d, const char *tag) {
+//    if (!hasTag_Bookmark(d, tag)) {
+//        addTag_Bookmark(d, tag);
+//    }
+//}
+//iLocalDef void addOrRemoveTag_Bookmark(iBookmark *d, const char *tag, iBool add) {
+//    if (add) {
+//        addTagIfMissing_Bookmark(d, tag);
+//    }
+//    else {
+//        removeTag_Bookmark(d, tag);
+//    }
+//}
 
 int     cmpTitleAscending_Bookmark      (const iBookmark **, const iBookmark **);
 int     cmpTree_Bookmark                (const iBookmark **, const iBookmark **);
@@ -109,7 +113,8 @@ iChar       siteIcon_Bookmarks          (const iBookmarks *, const iString *url)
 uint32_t    findUrl_Bookmarks           (const iBookmarks *, const iString *url); /* O(n) */
 uint32_t    recentFolder_Bookmarks      (const iBookmarks *);
 
-iBool   filterTagsRegExp_Bookmarks      (void *regExp, const iBookmark *);
+//iBool   filterTagsRegExp_Bookmarks      (void *regExp, const iBookmark *);
+iBool       filterHomepage_Bookmark     (void *, const iBookmark *);
 
 /**
  * Lists all or a subset of the bookmarks in a sorted array of Bookmark pointers.
diff --git a/src/feeds.c b/src/feeds.c
index 26b3d6db..b7ce739b 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -97,8 +97,8 @@ static void init_FeedJob(iFeedJob *d, const iBookmark *bookmark) {
     init_PtrArray(&d->results);
     iZap(d->startTime);
     d->isFirstUpdate = iFalse;
-    d->checkHeadings = hasTag_Bookmark(bookmark, headings_BookmarkTag);
-    d->ignoreWeb     = hasTag_Bookmark(bookmark, ignoreWeb_BookmarkTag);
+    d->checkHeadings = (bookmark->flags & headings_BookmarkFlag) != 0;
+    d->ignoreWeb     = (bookmark->flags & ignoreWeb_BookmarkFlag) != 0;
 }
 
 static void deinit_FeedJob(iFeedJob *d) {
@@ -146,13 +146,7 @@ static void submit_FeedJob_(iFeedJob *d) {
 
 static iBool isSubscribed_(void *context, const iBookmark *bm) {
     iUnused(context);
-    static iRegExp *pattern_ = NULL;
-    if (!pattern_) {
-        pattern_ = new_RegExp("\\bsubscribed\\b", caseSensitive_RegExpOption);
-    }
-    iRegExpMatch m;
-    init_RegExpMatch(&m);
-    return matchString_RegExp(pattern_, &bm->tags, &m);
+    return (bm->flags & subscribed_BookmarkFlag) != 0;
 }
 
 static const iPtrArray *listSubscriptions_(void) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index aac77572..39dd3aab 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1108,7 +1108,7 @@ static void documentWasChanged_DocumentWidget_(iDocumentWidget *d) {
     const uint16_t bmid = findUrl_Bookmarks(bookmarks_App(), d->mod.url);
     if (bmid) {
         const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
-        if (hasTag_Bookmark(bm, linkSplit_BookmarkTag)) {
+        if (bm->flags & linkSplit_BookmarkFlag) {
             d->flags |= otherRootByDefault_DocumentWidgetFlag;
         }
     }
@@ -3383,7 +3383,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                           linkUrl_GmDocument(d->doc, run->linkId))) != 0) {
                 const iBookmark *bm = get_Bookmarks(bookmarks_App(), bmid);
                 /* We can import local copies of remote bookmarks. */
-                if (!hasTag_Bookmark(bm, remote_BookmarkTag)) {
+                if (~bm->flags & remote_BookmarkFlag) {
                     remove_PtrArrayIterator(&i);
                 }
             }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 550fccde..b6aa06b1 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -407,11 +407,6 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             break;
         }
         case bookmarks_SidebarMode: {
-            iRegExp *homeTag         = iClob(new_RegExp("\\b" homepage_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *subTag          = iClob(new_RegExp("\\b" subscribed_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteSourceTag = iClob(new_RegExp("\\b" remoteSource_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *remoteTag       = iClob(new_RegExp("\\b" remote_BookmarkTag "\\b", caseSensitive_RegExpOption));
-            iRegExp *linkSplitTag    = iClob(new_RegExp("\\b" linkSplit_BookmarkTag "\\b", caseSensitive_RegExpOption));
             iConstForEach(PtrArray, i, list_Bookmarks(bookmarks_App(), cmpTree_Bookmark, NULL, NULL)) {
                 const iBookmark *bm = i.ptr;
                 if (isBookmarkFolded_SidebarWidget_(d, bm)) {
@@ -430,27 +425,21 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 }
                 set_String(&item->url, &bm->url);
                 set_String(&item->label, &bm->title);
-                /* Icons for special tags. */ {
-                    iRegExpMatch m;
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(subTag, &bm->tags, &m)) {
+                /* Icons for special behaviors. */ {
+                    if (bm->flags & subscribed_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x2605);
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(homeTag, &bm->tags, &m)) {
+                    if (bm->flags & homepage_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x1f3e0);
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(remoteTag, &bm->tags, &m)) {
+                    if (bm->flags & remote_BookmarkFlag) { 
                         item->listItem.isDraggable = iFalse;
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(remoteSourceTag, &bm->tags, &m)) {
+                    if (bm->flags & remoteSource_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x2913);
                         item->isBold = iTrue;
                     }
-                    init_RegExpMatch(&m);
-                    if (matchString_RegExp(linkSplitTag, &bm->tags, &m)) {
+                    if (bm->flags & linkSplit_BookmarkFlag) {
                         appendChar_String(&item->meta, 0x25e7);
                     }
                 }
@@ -1042,19 +1031,16 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                 set_String(&bm->url, url);
                 set_String(&bm->tags, tags);
                 if (isEmpty_String(icon)) {
-                    removeTag_Bookmark(bm, userIcon_BookmarkTag);
+                    bm->flags &= ~userIcon_BookmarkFlag;
                     bm->icon = 0;
                 }
                 else {
-                    addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+                    bm->flags |= userIcon_BookmarkFlag;
                     bm->icon = first_String(icon);
                 }
-                addOrRemoveTag_Bookmark(bm, homepage_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
-                addOrRemoveTag_Bookmark(bm, remoteSource_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
-                addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
-                                        isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
+                iChangeFlags(bm->flags, homepage_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.home")));
+                iChangeFlags(bm->flags, remoteSource_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
+                iChangeFlags(bm->flags, linkSplit_BookmarkFlag, isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
             }
             const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
             if (!folder || !hasParent_Bookmark(folder, id_Bookmark(bm))) {
@@ -1152,7 +1138,7 @@ static void bookmarkMoved_SidebarWidget_(iSidebarWidget *d, size_t index, size_t
                                                             : dstIndex);
     if (isLast && isBefore) isBefore = iFalse;
     const iBookmark *dst = get_Bookmarks(bookmarks_App(), dstItem->id);
-    if (hasParent_Bookmark(dst, movingItem->id) || hasTag_Bookmark(dst, remote_BookmarkTag)) {
+    if (hasParent_Bookmark(dst, movingItem->id) || dst->flags & remote_BookmarkFlag) {
         /* Can't move a folder inside itself, and remote bookmarks cannot be reordered. */
         return;
     }
@@ -1176,7 +1162,8 @@ static void bookmarkMovedOntoFolder_SidebarWidget_(iSidebarWidget *d, size_t ind
 static size_t numBookmarks_(const iPtrArray *bmList) {
     size_t num = 0;
     iConstForEach(PtrArray, i, bmList) {
-        if (!isFolder_Bookmark(i.ptr) && !hasTag_Bookmark(i.ptr, remote_BookmarkTag)) {
+        const iBookmark *bm = i.ptr;
+        if (!isFolder_Bookmark(bm) && ~bm->flags & remote_BookmarkFlag) {
             num++;
         }
     }
@@ -1349,13 +1336,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 if (!isFolder_Bookmark(bm)) {
                     setText_InputWidget(urlInput, &bm->url);
                     setText_InputWidget(tagsInput, &bm->tags);
-                    if (hasTag_Bookmark(bm, userIcon_BookmarkTag)) {
+                    if (bm->flags & userIcon_BookmarkFlag) {
                         setText_InputWidget(iconInput,
                                             collect_String(newUnicodeN_String(&bm->icon, 1)));
                     }
-                    setToggle_Widget(homeTag, hasTag_Bookmark(bm, homepage_BookmarkTag));
-                    setToggle_Widget(remoteSourceTag, hasTag_Bookmark(bm, remoteSource_BookmarkTag));
-                    setToggle_Widget(linkSplitTag, hasTag_Bookmark(bm, linkSplit_BookmarkTag));
+                    setToggle_Widget(homeTag, bm->flags & homepage_BookmarkFlag);
+                    setToggle_Widget(remoteSourceTag, bm->flags & remoteSource_BookmarkFlag);
+                    setToggle_Widget(linkSplitTag, bm->flags & linkSplit_BookmarkFlag);
                 }
                 else {
                     setFlags_Widget(findChild_Widget(dlg, "bmed.special"),
@@ -1376,7 +1363,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                const iBool isRemote = hasTag_Bookmark(bm, remote_BookmarkTag);
+                const iBool isRemote = (bm->flags & remote_BookmarkFlag) != 0;
                 iChar icon = isRemote ? 0x1f588 : bm->icon;
                 iWidget *dlg = makeBookmarkCreation_Widget(&bm->url, &bm->title, icon);
                 setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
@@ -1390,17 +1377,16 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "bookmark.tag")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
-                const char *tag = cstr_String(string_Command(cmd, "tag"));
+                const iRangecc tag = range_Command(cmd, "tag");
+                const int      flag =
+                    (equal_Rangecc(tag, "homepage") ? homepage_BookmarkFlag : 0) |
+                    (equal_Rangecc(tag, "subscribed") ? subscribed_BookmarkFlag : 0) |
+                    (equal_Rangecc(tag, "remotesource") ? remoteSource_BookmarkFlag : 0);
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-                if (hasTag_Bookmark(bm, tag)) {
-                    removeTag_Bookmark(bm, tag);
-                    if (!iCmpStr(tag, subscribed_BookmarkTag)) {
-                        removeEntries_Feeds(item->id);
-                    }
-                }
-                else {
-                    addTag_Bookmark(bm, tag);
+                if (flag == subscribed_BookmarkFlag && (bm->flags & flag)) {
+                    removeEntries_Feeds(item->id); /* get rid of unsubscribed entries */
                 }
+                bm->flags ^= flag;
                 postCommand_App("bookmarks.changed");
             }
             return iTrue;
@@ -1525,7 +1511,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     }
                     if (isCommand_Widget(w, ev, "feed.entry.unsubscribe")) {
                         if (arg_Command(cmd)) {
-                            removeTag_Bookmark(feedBookmark, subscribed_BookmarkTag);
+                            feedBookmark->flags &= ~subscribed_BookmarkFlag;
                             removeEntries_Feeds(id_Bookmark(feedBookmark));
                             updateItems_SidebarWidget_(d);
                         }
@@ -1733,17 +1719,17 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     if (bm) {
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:homepage",
-                                                hasTag_Bookmark(bm, homepage_BookmarkTag)
+                                                bm->flags & homepage_BookmarkFlag
                                                     ? home_Icon " ${bookmark.untag.home}"
                                                     : home_Icon " ${bookmark.tag.home}");
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:subscribed",
-                                                hasTag_Bookmark(bm, subscribed_BookmarkTag)
+                                                bm->flags & subscribed_BookmarkFlag
                                                     ? star_Icon " ${bookmark.untag.sub}"
                                                     : star_Icon " ${bookmark.tag.sub}");
                         setMenuItemLabel_Widget(d->menu,
                                                 "bookmark.tag tag:remotesource",
-                                                hasTag_Bookmark(bm, remoteSource_BookmarkTag)
+                                                bm->flags & remoteSource_BookmarkFlag
                                                     ? downArrowBar_Icon " ${bookmark.untag.remote}"
                                                     : downArrowBar_Icon " ${bookmark.tag.remote}");
                     }
@@ -1797,13 +1783,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 const iSidebarItem *hoverItem = hoverItem_ListWidget(d->list);
                 iAssert(hoverItem);
                 const iBookmark *  bm              = get_Bookmarks(bookmarks_App(), hoverItem->id);
-                const iBool        isRemote        = hasTag_Bookmark(bm, remote_BookmarkTag);
+                const iBool        isRemote        = (bm->flags & remote_BookmarkFlag) != 0;
                 static const char *localOnlyCmds[] = { "bookmark.edit",
                                                        "bookmark.delete",
-                                                       "bookmark.tag tag:" subscribed_BookmarkTag,
-                                                       "bookmark.tag tag:" homepage_BookmarkTag,
-                                                       "bookmark.tag tag:" remoteSource_BookmarkTag,
-                                                       "bookmark.tag tag:" subscribed_BookmarkTag };
+                                                       "bookmark.tag tag:subscribed",
+                                                       "bookmark.tag tag:homepage",
+                                                       "bookmark.tag tag:remotesource" };
                 iForIndices(i, localOnlyCmds) {
                     setFlags_Widget(as_Widget(findMenuItem_Widget(d->menu, localOnlyCmds[i])),
                                     disabled_WidgetFlag,
diff --git a/src/ui/util.c b/src/ui/util.c
index baa05082..6f5eced3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2908,16 +2908,16 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
             iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
             if (!isEmpty_String(icon)) {
-                addTagIfMissing_Bookmark(bm, userIcon_BookmarkTag);
+                bm->flags |= userIcon_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.home"))) {
-                addTag_Bookmark(bm, homepage_BookmarkTag);
+                bm->flags |= homepage_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote"))) {
-                addTag_Bookmark(bm, remoteSource_BookmarkTag);
+                bm->flags |= remoteSource_BookmarkFlag;
             }
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
-                addTag_Bookmark(bm, linkSplit_BookmarkTag);
+                bm->flags |= linkSplit_BookmarkFlag;
             }
             bm->parentId = folder ? id_Bookmark(folder) : 0;
             setRecentFolder_Bookmarks(bookmarks_App(), bm->parentId);
@@ -2983,9 +2983,9 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
         iBookmark *bm = get_Bookmarks(bookmarks_App(), id);
         iAssert(bm);
         set_String(&bm->title, feedTitle);
-        addOrRemoveTag_Bookmark(bm, subscribed_BookmarkTag, iTrue);
-        addOrRemoveTag_Bookmark(bm, headings_BookmarkTag, headings);
-        addOrRemoveTag_Bookmark(bm, ignoreWeb_BookmarkTag, ignoreWeb);
+        bm->flags |= subscribed_BookmarkFlag;
+        iChangeFlags(bm->flags, headings_BookmarkFlag, headings);
+        iChangeFlags(bm->flags, ignoreWeb_BookmarkFlag, ignoreWeb);
         postCommand_App("bookmarks.changed");
         setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
@@ -3048,13 +3048,13 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
                             bm ? &bm->title : feedTitle_DocumentWidget(document_App()));
         setFlags_Widget(findChild_Widget(dlg,
-                                         hasTag_Bookmark(bm, headings_BookmarkTag)
+                                         bm->flags & headings_BookmarkFlag
                                              ? "feedcfg.type.headings"
                                              : "feedcfg.type.gemini"),
                         selected_WidgetFlag,
                         iTrue);
         setToggle_Widget(findChild_Widget(dlg, "feedcfg.ignoreweb"),
-                         hasTag_Bookmark(bm, ignoreWeb_BookmarkTag));
+                         bm->flags & ignoreWeb_BookmarkFlag);
         setCommandHandler_Widget(dlg, handleFeedSettingCommands_);
     }
     setupSheetTransition_Mobile(dlg, incoming_TransitionFlag);