diff --git a/Monitor/Pages/SettingsAnalyzer.cshtml.cs b/Monitor/Pages/SettingsAnalyzer.cshtml.cs
index 0fd8bb9..dcca15d 100644
--- a/Monitor/Pages/SettingsAnalyzer.cshtml.cs
+++ b/Monitor/Pages/SettingsAnalyzer.cshtml.cs
@@ -185,6 +185,8 @@ namespace Monitor.Pages
         sms.OffTriggerConnection = HttpContext.Request.Form[smsFormKey + "OffTriggerConnection"];
         sms.IgnoredMarkets = HttpContext.Request.Form[smsFormKey + "IgnoredMarkets"];
         sms.AllowedMarkets = HttpContext.Request.Form[smsFormKey + "AllowedMarkets"];
+        sms.IgnoredGlobalSettings = HttpContext.Request.Form[smsFormKey + "IgnoredGlobalSettings"];
+        sms.AllowedGlobalSettings = HttpContext.Request.Form[smsFormKey + "AllowedGlobalSettings"];
         sms.StopProcessWhenTriggered = HttpContext.Request.Form[smsFormKey + "StopProcessWhenTriggered"].Equals("on");
 
         #region Triggers
diff --git a/Monitor/Pages/_get/SettingsSingleMarketSettings.cshtml b/Monitor/Pages/_get/SettingsSingleMarketSettings.cshtml
index be75b87..d79702c 100644
--- a/Monitor/Pages/_get/SettingsSingleMarketSettings.cshtml
+++ b/Monitor/Pages/_get/SettingsSingleMarketSettings.cshtml
@@ -61,6 +61,21 @@
           </div>
         </div>
 
+        <div class="form-group row">
+          <label class="col-md-4 col-form-label">Ignored Global Settings <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Comma separated list of global settings you want to be ignored in this single market setting."></i></label>
+          <div class="col-md-8">
+            <input type="text" class="form-control" name="MarketAnalyzer_SingleMarketSetting_@(Model.SettingName)|IgnoredGlobalSettings" value="@Model.SingleMarketSetting.IgnoredGlobalSettings">
+          </div>
+        </div>
+
+        <div class="form-group row">
+          <label class="col-md-4 col-form-label">Allowed Global Settings <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Comma separated list of markets that are allowed for this single market setting to get applied to."></i></label>
+          <div class="col-md-8">
+            <input type="text" class="form-control" name="MarketAnalyzer_SingleMarketSetting_@(Model.SettingName)|AllowedGlobalSettings" value="@Model.SingleMarketSetting.AllowedGlobalSettings">
+            <span class="help-block"><small>Leave empty to allow all</small></span>
+          </div>
+        </div>
+
         <div class="form-group row">
           <label class="col-md-4 col-form-label">Stop Process When Triggered <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="Stops looking for other single market settings when this setting gets triggered for a market."></i></label>
           <div class="col-md-8">
diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs
index 94716b9..6139695 100644
--- a/PTMagic/Program.cs
+++ b/PTMagic/Program.cs
@@ -6,7 +6,7 @@ using Core.Helper;
 using Microsoft.Extensions.DependencyInjection;
 
 
-[assembly: AssemblyVersion("2.5.7")]
+[assembly: AssemblyVersion("2.5.8")]
 [assembly: AssemblyProduct("PT Magic")]
 
 namespace PTMagic