diff --git a/Controllers/VehicleController.cs b/Controllers/VehicleController.cs
index d6245e1..ae48f54 100644
--- a/Controllers/VehicleController.cs
+++ b/Controllers/VehicleController.cs
@@ -589,7 +589,8 @@ namespace CarCareTracker.Controllers
                 Gallons = result.Gallons,
                 IsFillToFull = result.IsFillToFull,
                 MissedFuelUp = result.MissedFuelUp,
-                Notes = result.Notes
+                Notes = result.Notes,
+                Tags = result.Tags
             };
             var vehicleData = _dataAccess.GetVehicleById(convertedResult.VehicleId);
             var vehicleIsElectric = vehicleData.IsElectric;
diff --git a/Helper/GasHelper.cs b/Helper/GasHelper.cs
index 4dce396..6dc6c1b 100644
--- a/Helper/GasHelper.cs
+++ b/Helper/GasHelper.cs
@@ -68,7 +68,8 @@ namespace CarCareTracker.Helper
                         CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
                         IsFillToFull = currentObject.IsFillToFull,
                         MissedFuelUp = currentObject.MissedFuelUp,
-                        Notes = currentObject.Notes
+                        Notes = currentObject.Notes,
+                        Tags = currentObject.Tags
                     };
                     if (currentObject.MissedFuelUp)
                     {
@@ -120,7 +121,8 @@ namespace CarCareTracker.Helper
                         CostPerGallon = convertedConsumption > 0.00M ? currentObject.Cost / convertedConsumption : 0,
                         IsFillToFull = currentObject.IsFillToFull,
                         MissedFuelUp = currentObject.MissedFuelUp,
-                        Notes = currentObject.Notes
+                        Notes = currentObject.Notes,
+                        Tags = currentObject.Tags
                     });
                 }
                 previousMileage = currentObject.Mileage;
diff --git a/Models/GasRecord/GasRecord.cs b/Models/GasRecord/GasRecord.cs
index 336c60e..6fe085a 100644
--- a/Models/GasRecord/GasRecord.cs
+++ b/Models/GasRecord/GasRecord.cs
@@ -18,5 +18,6 @@
         public bool MissedFuelUp { get; set; } = false;
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<string> Tags { get; set; } = new List<string>();
     }
 }
diff --git a/Models/GasRecord/GasRecordInput.cs b/Models/GasRecord/GasRecordInput.cs
index 37fe265..72ec723 100644
--- a/Models/GasRecord/GasRecordInput.cs
+++ b/Models/GasRecord/GasRecordInput.cs
@@ -18,6 +18,7 @@
         public bool MissedFuelUp { get; set; } = false;
         public string Notes { get; set; }
         public List<UploadedFiles> Files { get; set; } = new List<UploadedFiles>();
+        public List<string> Tags { get; set; } = new List<string>();
         public GasRecord ToGasRecord() { return new GasRecord { 
             Id = Id, 
             Cost = Cost, 
@@ -28,7 +29,8 @@
             Files = Files,
             IsFillToFull = IsFillToFull,
             MissedFuelUp = MissedFuelUp,
-            Notes = Notes
+            Notes = Notes,
+            Tags = Tags
         }; }
     }
 }
diff --git a/Models/GasRecord/GasRecordViewModel.cs b/Models/GasRecord/GasRecordViewModel.cs
index 1eee41f..b9825f4 100644
--- a/Models/GasRecord/GasRecordViewModel.cs
+++ b/Models/GasRecord/GasRecordViewModel.cs
@@ -21,5 +21,6 @@
         public bool IsFillToFull { get; set; }
         public bool MissedFuelUp { get; set; }
         public string Notes { get; set; }
+        public List<string> Tags { get; set; } = new List<string>();
     }
 }
diff --git a/Views/Vehicle/_Gas.cshtml b/Views/Vehicle/_Gas.cshtml
index c2c7d0a..fb0c839 100644
--- a/Views/Vehicle/_Gas.cshtml
+++ b/Views/Vehicle/_Gas.cshtml
@@ -12,6 +12,7 @@
     var gasCostFormat = useThreeDecimals ? "C3" : "C2";
     var useKwh = Model.UseKwh;
     var useHours = Model.UseHours;
+    var recordTags = Model.GasRecords.SelectMany(x => x.Tags).Distinct();
     string preferredFuelEconomyUnit = userConfig.PreferredGasMileageUnit;
     string preferredGasUnit = userConfig.PreferredGasUnit;
     string consumptionUnit;
@@ -41,7 +42,7 @@
 <div class="row">
     <div class="d-flex justify-content-between">
         <div class="d-flex align-items-center flex-wrap">
-            <span class="ms-2 badge bg-success">@($"# of Gas Records: {Model.GasRecords.Count()}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="count">@($"# of Gas Records: {Model.GasRecords.Count()}")</span>
             @if (Model.GasRecords.Where(x => x.MilesPerGallon > 0).Any())
             {
                 <span class="ms-2 badge bg-primary" id="averageFuelMileageLabel">@($"Average Fuel Economy: {gasHelper.GetAverageGasMileage(Model.GasRecords, useMPG)}")</span>
@@ -56,7 +57,17 @@
                 }
             }
             <span class="ms-2 badge bg-success">@($"Total Fuel Consumed: {Model.GasRecords.Sum(x => x.Gallons).ToString("F")}")</span>
-            <span class="ms-2 badge bg-success">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
+            <span class="ms-2 badge bg-success" data-aggregate-type="sum">@($"Total Cost: {Model.GasRecords.Sum(x => x.Cost).ToString(gasCostFormat)}")</span>
+            @foreach (string recordTag in recordTags)
+            {
+                <span onclick="filterTable('gas-tab-pane', this)" class="user-select-none ms-2 rounded-pill badge bg-secondary tagfilter" style="cursor:pointer;">@recordTag</span>
+            }
+            <datalist id="tagList">
+                @foreach (string recordTag in recordTags)
+                {
+                    <!option value="@recordTag"></!option>
+                }
+            </datalist>
         </div>
         @if (enableCsvImports)
         {
@@ -98,12 +109,12 @@
             <tbody>
                 @foreach (GasRecordViewModel gasRecord in Model.GasRecords)
                 {
-                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditGasRecordModal(@gasRecord.Id)">
+                    <tr class="d-flex" style="cursor:pointer;" onclick="showEditGasRecordModal(@gasRecord.Id)" data-tags='@string.Join(" ", gasRecord.Tags)'>
                         <td class="col-2">@gasRecord.Date</td>
                         <td class="col-2">@gasRecord.Mileage</td>
                         <td class="col-2" data-gas-type="consumption">@gasRecord.Gallons.ToString("F")</td>
                         <td class="col-4" data-gas-type="fueleconomy">@(gasRecord.MilesPerGallon == 0 ? "---" : gasRecord.MilesPerGallon.ToString("F"))</td>
-                        <td class="col-1">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
+                        <td class="col-1" data-record-type="cost">@((hideZero && gasRecord.Cost == default) ? "---" : gasRecord.Cost.ToString(gasCostFormat))</td>
                         <td class="col-1" data-gas-type="unitcost">@((hideZero && gasRecord.CostPerGallon == default) ? "---" : gasRecord.CostPerGallon.ToString(gasCostFormat))</td>
                     </tr>
                 }
diff --git a/Views/Vehicle/_GasModal.cshtml b/Views/Vehicle/_GasModal.cshtml
index 759f90b..8d5049a 100644
--- a/Views/Vehicle/_GasModal.cshtml
+++ b/Views/Vehicle/_GasModal.cshtml
@@ -76,6 +76,13 @@
                     {
                         <input type="text" id="gasRecordCost" class="form-control" placeholder="Cost of gas refueled" value="@(isNew ? "" : Model.GasRecord.Cost)">
                     }
+                    <label for="gasRecordTag">Tags(optional)</label>
+                    <select multiple class="form-select" id="gasRecordTag">
+                        @foreach (string tag in Model.GasRecord.Tags)
+                        {
+                            <!option value="@tag">@tag</!option>
+                        }
+                    </select>
                 </div>
                 <div class="col-md-6 col-12">
                     <label for="gasRecordNotes">Notes(optional)<a class="link-underline link-underline-opacity-0" onclick="showLinks(this)"><i class="bi bi-markdown ms-2"></i></a></label>
diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
index 49ce0ff..0fbeef7 100644
--- a/wwwroot/js/gasrecord.js
+++ b/wwwroot/js/gasrecord.js
@@ -4,6 +4,7 @@
             $("#gasRecordModalContent").html(data);
             //initiate datepicker
             initDatePicker($('#gasRecordDate'));
+            initTagSelector($("#gasRecordTag"));
             $('#gasRecordModal').modal('show');
         }
     });
@@ -14,6 +15,7 @@ function showEditGasRecordModal(gasRecordId) {
             $("#gasRecordModalContent").html(data);
             //initiate datepicker
             initDatePicker($('#gasRecordDate'));
+            initTagSelector($("#gasRecordTag"));
             $('#gasRecordModal').modal('show');
             $('#gasRecordModal').off('shown.bs.modal').on('shown.bs.modal', function () {
                 if (getGlobalConfig().useMarkDown) {
@@ -80,6 +82,7 @@ function getAndValidateGasRecordValues() {
     var gasIsFillToFull = $("#gasIsFillToFull").is(":checked");
     var gasIsMissed = $("#gasIsMissed").is(":checked");
     var gasNotes = $("#gasRecordNotes").val();
+    var gasTags = $("#gasRecordTag").val();
     var vehicleId = GetVehicleId().vehicleId;
     var gasRecordId = getGasRecordModelData().id;
     //validation
@@ -128,6 +131,7 @@ function getAndValidateGasRecordValues() {
         gallons: gasGallons,
         cost: gasCost,
         files: uploadedFiles,
+        tags: gasTags,
         isFillToFull: gasIsFillToFull,
         missedFuelUp: gasIsMissed,
         notes: gasNotes