diff --git a/src/JobsMedical.Web/Pages/Shared/_ShiftCard.cshtml b/src/JobsMedical.Web/Pages/Shared/_ShiftCard.cshtml
index ed9b696..f32089c 100644
--- a/src/JobsMedical.Web/Pages/Shared/_ShiftCard.cshtml
+++ b/src/JobsMedical.Web/Pages/Shared/_ShiftCard.cshtml
@@ -11,14 +11,10 @@
 }
 <a class="card card-pad shift-card" asp-page="/Shifts/Details" asp-route-id="@Model.Id">
     <div class="row" style="justify-content: space-between;">
-        <span class="facility">@JobsMedical.Web.Services.SearchHighlight.Mark(Model.Facility?.Name, q)</span>
+        <span class="facility">@JobsMedical.Web.Services.SearchHighlight.Mark(Model.Role?.Name ?? "شیفت", q)</span>
         <span class="badge @badgeClass">@typeLabel</span>
     </div>
     <div class="row">
-        @if (Model.Role is not null)
-        {
-            <span class="badge badge-type">@JobsMedical.Web.Services.SearchHighlight.Mark(Model.Role.Name, q)</span>
-        }
         @if (Model.GenderRequirement != Gender.Any)
         {
             <span class="badge badge-gender">@JalaliDate.GenderLabel(Model.GenderRequirement)</span>
@@ -27,6 +23,7 @@
         {
             <span class="badge badge-verified">✓ تأیید شده</span>
         }
+        <span>🏥 @JobsMedical.Web.Services.SearchHighlight.Mark(Model.Facility?.Name, q)</span>
     </div>
     <div class="row loc-row">📍 @Model.Facility?.City?.Name@(Model.Facility?.District is not null ? "، " + Model.Facility.District.Name : "")</div>
     @if (Model.DistanceKm is double km)