diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml b/GanjooRazor/Areas/User/Pages/Editor.cshtml
index 1ec10155..ca24b7ea 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml
@@ -120,6 +120,7 @@
     // staged client-side until the main save; each item matches
     // GanjoorPoemGeoDateTagCorrection's shape so it can be sent as-is
     var geoDateTagSuggestions = @Html.Raw(Model.MyLastEdit != null && Model.MyLastEdit.GeoDateTags != null ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.MyLastEdit.GeoDateTags, new Newtonsoft.Json.JsonSerializerSettings { ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver() }) : "[]");
+    var geoDateTagCoupletTexts = @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(Model.Couplets.ToDictionary(c => c.Item1.ToString(), c => c.Item2)));
     $(document).ready(function () {
         renderPendingGeoDateTags();
     });
@@ -153,12 +154,13 @@
             container.innerHTML = '';
             return;
         }
-        var html = '<table><tr><th>وضعیت</th><th>مکان</th><th>سال</th><th>ماه</th><th>روز</th><th>#</th></tr>';
+        var html = '<table><tr><th>وضعیت</th><th>بیت</th><th>مکان</th><th>سال</th><th>ماه</th><th>روز</th><th>#</th></tr>';
         for (var i = 0; i < geoDateTagSuggestions.length; i++) {
             var s = geoDateTagSuggestions[i];
             var status = s.markForDelete ? '🗑️ درخواست حذف' : '➕ پیشنهاد جدید';
+            var coupletText = (s.coupletIndex != null && geoDateTagCoupletTexts[s.coupletIndex]) ? geoDateTagCoupletTexts[s.coupletIndex] : '— کل شعر —';
             var locationText = s.markForDelete ? '' : (s.locationId ? $('#geotag-location-select option[value="' + s.locationId + '"]').text() : (s.suggestedLocationName || ''));
-            html += '<tr><td>' + status + '</td><td>' + locationText + '</td><td>' + (s.lunarYear || '') + '</td><td>' + (s.lunarMonth || '') + '</td><td>' + (s.lunarDay || '') + '</td>' +
+            html += '<tr><td>' + status + '</td><td>' + coupletText + '</td><td>' + locationText + '</td><td>' + (s.lunarYear || '') + '</td><td>' + (s.lunarMonth || '') + '</td><td>' + (s.lunarDay || '') + '</td>' +
                 '<td><a role="button" class="up-btn up-btn--sm up-btn--ghost" onclick="removeGeoDateTagSuggestion(' + i + ')">✕ حذف از فهرست</a></td></tr>';
         }
         html += '</table>';
@@ -184,6 +186,7 @@
     // error toast for the case where the user explicitly asked to add an
     // empty entry vs. silently having nothing to pick up on save).
     function readGeoDateTagFromForm(showErrorIfEmpty) {
+        var coupletIndex = $('#geotag-couplet-select').val();
         var locationId = $('#geotag-location-select').val();
         var newLocationName = $('#geotag-new-location-name').val();
         var newLocationLat = $('#geotag-new-location-lat').val();
@@ -204,6 +207,7 @@
 
         return {
             markForDelete: false,
+            coupletIndex: (coupletIndex && coupletIndex != '') ? parseInt(coupletIndex) : null,
             locationId: (locationId && locationId != '') ? parseInt(locationId) : null,
             suggestedLocationName: (!locationId || locationId == '') ? (newLocationName || null) : null,
             suggestedLatitude: (!locationId || locationId == '') && newLocationLat ? parseFloat(newLocationLat) : null,
@@ -217,6 +221,7 @@
     }
 
     function resetGeoDateTagForm() {
+        $('#geotag-couplet-select').val('');
         $('#geotag-location-select').val('');
         $('#geotag-new-location-name').val('');
         $('#geotag-new-location-lat').val('');
@@ -921,6 +926,7 @@ else
                 {
                     <tr>
                         <td colspan="2">
+                            <p class="up-hint">بیت: @(geoDateTag.CoupletIndex != null ? (Model.Couplets.Where(c => c.Item1 == geoDateTag.CoupletIndex).Select(c => c.Item2).FirstOrDefault() ?? "— کل شعر —") : "— کل شعر —")</p>
                             @if (geoDateTag.MarkForDelete)
                             {
                                 <p class="red-color">درخواست حذف برچسب موجود (#@geoDateTag.ExistingTagId)</p>
@@ -1756,6 +1762,7 @@ else
         {
             <table>
                 <tr>
+                    <th>بیت</th>
                     <th>مکان</th>
                     <th>سال</th>
                     <th>ماه</th>
@@ -1765,6 +1772,7 @@ else
                 @foreach (var tag in Model.PoemGeoDateTags)
                 {
                     <tr id="existing-geotag-@tag.Id">
+                        <td>@(Model.Couplets.Where(c => c.Item1 == tag.CoupletIndex).Select(c => c.Item2).FirstOrDefault() ?? "— کل شعر —")</td>
                         <td>@($"{(tag.Location == null ? "" : tag.Location.Name)}")</td>
                         <td>@tag.LunarYear</td>
                         <td>
@@ -1833,6 +1841,18 @@ else
 
         <div id="pending-geotag-suggestions"></div>
 
+        <div class="up-field">
+            <label for="geotag-couplet-select">بیت</label>
+            <select id="geotag-couplet-select">
+                <option value="">— کل شعر —</option>
+                @foreach (var couplet in Model.Couplets)
+                {
+                    <option value="@couplet.Item1">@($"{(couplet.Item1 + 1).ToPersianNumbers()} - {couplet.Item2}")</option>
+                }
+            </select>
+            <p class="up-hint">اگر این برچسب به یک بیت مشخص اشاره دارد، آن را انتخاب کنید تا دیگران بتوانند شاهد آن را در متن پیدا کنند.</p>
+        </div>
+
         <div class="up-field">
             <label for="geotag-location-select">مکان</label>
             <select id="geotag-location-select">
diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
index 0c04148a..a0568e5b 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
@@ -27,6 +27,11 @@ namespace GanjooRazor.Areas.User.Pages
         /// </summary>
         public GanjoorPageCompleteViewModel PageInformation { get; set; }
 
+        /// <summary>
+        /// couplets (for the geo/date tag suggestion couplet-selection dropdown), same shape as SuggestQuoted's
+        /// </summary>
+        public Tuple<int, string>[] Couplets { get; set; }
+
         /// <summary>
         /// rhythms alphabetically
         /// </summary>
@@ -122,6 +127,62 @@ namespace GanjooRazor.Areas.User.Pages
             Languages = JsonConvert.DeserializeObject<GanjoorLanguage[]>(await response.Content.ReadAsStringAsync());
         }
 
+        /// <summary>
+        /// groups verses into couplets - same logic as SuggestQuoted.cshtml.cs's GetCouplets, duplicated here
+        /// rather than shared, so this page doesn't take on a cross-file dependency on that one
+        /// </summary>
+        /// <param name="verses"></param>
+        /// <returns></returns>
+        private Tuple<int, string>[] GetCouplets(GanjoorVerseViewModel[] verses)
+        {
+            int coupetIndex = -1;
+            string coupletText = "";
+            List<Tuple<int, string>> couplets = new List<Tuple<int, string>>();
+            int verseIndex = 0;
+            bool incompleteCouplet = false;
+            while (verseIndex < verses.Length)
+            {
+                switch (verses[verseIndex].VersePosition)
+                {
+                    case VersePosition.Comment:
+                        incompleteCouplet = false;
+                        break;
+                    case VersePosition.Paragraph:
+                    case VersePosition.Single:
+                        incompleteCouplet = false;
+                        if (!string.IsNullOrEmpty(coupletText))
+                        {
+                            couplets.Add(new Tuple<int, string>(coupetIndex, coupletText));
+                            coupletText = "";
+                        }
+                        coupetIndex++;
+                        couplets.Add(new Tuple<int, string>(coupetIndex, verses[verseIndex].Text));
+                        break;
+                    case VersePosition.Right:
+                    case VersePosition.CenteredVerse1:
+                        incompleteCouplet = false;
+                        if (!string.IsNullOrEmpty(coupletText))
+                        {
+                            couplets.Add(new Tuple<int, string>(coupetIndex, coupletText));
+                        }
+                        coupetIndex++;
+                        coupletText = verses[verseIndex].Text;
+                        break;
+                    case VersePosition.Left:
+                    case VersePosition.CenteredVerse2:
+                        incompleteCouplet = true;
+                        coupletText += $" - {verses[verseIndex].Text}";
+                        break;
+                }
+                verseIndex++;
+            }
+
+            if (incompleteCouplet && !string.IsNullOrEmpty(coupletText))
+                couplets.Add(new Tuple<int, string>(coupetIndex, coupletText));
+
+            return couplets.ToArray();
+        }
+
         /// <summary>
         /// get
         /// </summary>
@@ -189,6 +250,7 @@ namespace GanjooRazor.Areas.User.Pages
                         return Page();
                     }
                     PageInformation = JObject.Parse(await pageQuery.Content.ReadAsStringAsync()).ToObject<GanjoorPageCompleteViewModel>();
+                    Couplets = GetCouplets(PageInformation.Poem.Verses);
 
 
                     if (PageInformation.Poem.Sections.Where(s => s.SectionType == PoemSectionType.WholePoem && !string.IsNullOrEmpty(s.RhymeLetters)).Any())
@@ -443,7 +505,7 @@ namespace GanjooRazor.Areas.User.Pages
                             }
                         }
 
-                        if (title == null && poemSummary == null && vOrderTexts.Count == 0 && pcs.rhythm == null && pcs.rhythm2 == null && pcs.rhyme == null && pcs.format == null && (pcs.geoDateTags == null || pcs.geoDateTags.Length == 0))
+                        if (title == null && poemSummary == null && vOrderTexts.Count == 0 && pcs.rhythm == null && pcs.rhythm2 == null && pcs.rhyme == null && pcs.format == null)
                             return new BadRequestObjectResult("شما هیچ تغییری در اطلاعات نداده‌اید!");
 
                         if (pcs.rhythm == "null")