4 files changed, 22 insertions, 6 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f2553632..0f0aeae8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3012,7 +3012,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "document.input.submit") && document_Command(cmd) == d) {
         postCommandf_Root(w->root,
-                          "open url:%s",
+                          /* use the `redirect:1` argument to cause the input query URL to be
+                             replaced in History; we don't want to navigate onto it */
+                          "open redirect:1 url:%s",
                           cstrCollect_String(makeQueryUrl_DocumentWidget_
                                              (d, collect_String(suffix_Command(cmd, "value")))));
         return iTrue;
@@ -3066,7 +3068,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         iReleasePtr(&d->request);
         updateVisible_DocumentWidget_(d);
         d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-        postCommandf_Root(w->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
+        postCommandf_Root(w->root,
+                          "document.changed doc:%p status:%d url:%s",
+                          d,
+                          d->sourceStatus,
+                          cstr_String(d->mod.url));
         /* Check for a pending goto. */
         if (!isEmpty_String(&d->pendingGotoHeading)) {
             scrollToHeading_DocumentWidget_(d, cstr_String(&d->pendingGotoHeading));
diff --git a/src/ui/root.c b/src/ui/root.c
index 4849d0c7..5bfae857 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -760,9 +760,17 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             if (equal_Command(cmd, "document.changed")) {
                 iInputWidget *url = findWidget_Root("url");
                 const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
+                const enum iGmStatusCode statusCode = argLabel_Command(cmd, "status");
                 trimCache_App();
                 trimMemory_App();
-                visitUrl_Visited(visited_App(), urlStr, 0);
+                visitUrl_Visited(visited_App(),
+                                 urlStr,
+                                 /* The transient flag modifies history navigation behavior on
+                                    special responses like input queries. */
+                                 category_GmStatusCode(statusCode) == categoryInput_GmStatusCode ||
+                                 category_GmStatusCode(statusCode) == categoryRedirect_GmStatusCode
+                                     ? transient_VisitedUrlFlag
+                                     : 0);
                 postCommand_App("visited.changed"); /* sidebar will update */
                 setText_InputWidget(url, urlStr);
                 checkLoadAnimation_Root_(get_Root());
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 4b6fde3c..3abfd498 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -2019,7 +2019,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                       add_I2(topLeft_Rect(itemRect),
                              init_I2(3 * gap_UI, (itemHeight - lineHeight_Text(font)) / 2)),
                       fg,
-                      "%s%s%s%s%s%s",
+                      "%s%s%s%s%s%s%s%s",
                       isGemini ? "" : cstr_Rangecc(parts.scheme),
                       isGemini ? "" : isAbout ? ":" : "://",
                       escape_Color(isHover ? (isPressing ? uiTextPressed_ColorId
@@ -2027,7 +2027,9 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                            : uiTextStrong_ColorId),
                       cstr_Rangecc(parts.host),
                       escape_Color(fg),
-                      cstr_Rangecc(parts.path));
+                      cstr_Rangecc(parts.path),
+                      !isEmpty_Range(&parts.query) ? escape_Color(uiAnnotation_ColorId) : "",
+                      !isEmpty_Range(&parts.query) ? cstr_Rangecc(parts.query) : "");
         }
         iEndCollect();
     }
diff --git a/src/visited.c b/src/visited.c
index 466add5b..4552a053 100644
--- a/src/visited.c
+++ b/src/visited.c
@@ -46,7 +46,7 @@ static int cmpUrl_VisitedUrl_(const void *a, const void *b) {
 }
 
 static int cmpNewer_VisitedUrl_(const void *insert, const void *existing) {
-    return seconds_Time(&((const iVisitedUrl *) insert  )->when) >
+    return seconds_Time(&((const iVisitedUrl *) insert  )->when) >=
            seconds_Time(&((const iVisitedUrl *) existing)->when);
 }