diff --git a/Warframe_Alerts/Form1.cs b/Warframe_Alerts/Form1.cs
index 38c97d2..8cb28d4 100644
--- a/Warframe_Alerts/Form1.cs
+++ b/Warframe_Alerts/Form1.cs
@@ -220,11 +220,11 @@ public void WF_Update()
                 var title = alerts[i].Title;
                 var titleSp = title.Split('-');
 
-                title = titleSp[0];
+                var tempTitle = titleSp[0];
 
                 for (var j = 1; j < titleSp.Length - 1; j++)
                 {
-                    title = title + "-" + titleSp[j];
+                    tempTitle = tempTitle + "-" + titleSp[j];
                 }
 
                 var description = alerts[i].Description;
@@ -253,7 +253,7 @@ public void WF_Update()
                 aLeft = aLeft + aSpan.Seconds + " Seconds Left";
 
                 _idList.Add(aId);
-                string[] row = {description, title, faction, aLeft};
+                string[] row = {description, tempTitle, faction, aLeft};
                 var listViewItem = new ListViewItem(row);
                 //AlertData.Items.Add(listViewItem);
                 Invoke(new Action(() => AlertData.Items.Add(listViewItem)));
@@ -472,22 +472,27 @@ private bool Filter_Alerts(string title)
 
             if (!BlueprintFilter)
             {
-                if (title.IndexOf("(Blueprint)", StringComparison.Ordinal) != -1)
+                if (title.IndexOf("(Blueprint)", StringComparison.Ordinal) != -1 &&
+                    title.IndexOf("Catalyst", StringComparison.Ordinal) == -1 &&
+                    title.IndexOf("Reactor", StringComparison.Ordinal) == -1)
                 {
                     flag = false;
                 }
             }
 
-            var dashCount = 0;
-
             if (!CreditFilter)
             {
+                var dashCount = 0;
+                var previous = 'X';
+
                 foreach (var t in title)
                 {
-                    if (t == '-')
+                    if (t == '-' && previous == ' ')
                     {
                         dashCount++;
                     }
+
+                    previous = t;
                 }
 
                 if (dashCount == 2)
@@ -503,7 +508,8 @@ private bool Filter_Alerts(string title)
 
             if (!ModFilter)
             {
-                if (title.IndexOf("(Mod)", StringComparison.Ordinal) != -1)
+                if (title.IndexOf("(Mod)", StringComparison.Ordinal) != -1 &&
+                    title.IndexOf("Riven", StringComparison.Ordinal) == -1)
                 {
                     flag = false;
                 }
diff --git a/Warframe_Alerts/Secondary_Form.Designer.cs b/Warframe_Alerts/Secondary_Form.Designer.cs
index b8578a7..e9dda58 100644
--- a/Warframe_Alerts/Secondary_Form.Designer.cs
+++ b/Warframe_Alerts/Secondary_Form.Designer.cs
@@ -41,12 +41,13 @@ private void InitializeComponent()
             this.checkBoxResource = new System.Windows.Forms.CheckBox();
             this.checkBoxCredit = new System.Windows.Forms.CheckBox();
             this.checkBoxDetection = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(7, 136);
+            this.label1.Location = new System.Drawing.Point(9, 158);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(157, 13);
             this.label1.TabIndex = 0;
@@ -54,14 +55,14 @@ private void InitializeComponent()
             // 
             // textBoxInterval
             // 
-            this.textBoxInterval.Location = new System.Drawing.Point(11, 152);
+            this.textBoxInterval.Location = new System.Drawing.Point(13, 174);
             this.textBoxInterval.Name = "textBoxInterval";
-            this.textBoxInterval.Size = new System.Drawing.Size(315, 20);
+            this.textBoxInterval.Size = new System.Drawing.Size(532, 20);
             this.textBoxInterval.TabIndex = 1;
             // 
             // buttonSet
             // 
-            this.buttonSet.Location = new System.Drawing.Point(250, 179);
+            this.buttonSet.Location = new System.Drawing.Point(470, 200);
             this.buttonSet.Name = "buttonSet";
             this.buttonSet.Size = new System.Drawing.Size(75, 23);
             this.buttonSet.TabIndex = 2;
@@ -72,7 +73,7 @@ private void InitializeComponent()
             // buttonCancel
             // 
             this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(169, 179);
+            this.buttonCancel.Location = new System.Drawing.Point(389, 200);
             this.buttonCancel.Name = "buttonCancel";
             this.buttonCancel.Size = new System.Drawing.Size(75, 23);
             this.buttonCancel.TabIndex = 3;
@@ -134,14 +135,25 @@ private void InitializeComponent()
             this.checkBoxDetection.Text = "Pause notifications while Warframe is running";
             this.checkBoxDetection.UseVisualStyleBackColor = true;
             this.checkBoxDetection.CheckedChanged += new System.EventHandler(this.CheckBoxDetection_CheckedChanged);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(9, 136);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(500, 13);
+            this.label2.TabIndex = 10;
+            this.label2.Text = "Note: Rivens, Catalysts, Reactors and Nitain are considered high priority alerts " +
+    "and thus are never filtered";
             // 
             // SecondaryForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.buttonCancel;
-            this.ClientSize = new System.Drawing.Size(338, 213);
+            this.ClientSize = new System.Drawing.Size(557, 232);
             this.ControlBox = false;
+            this.Controls.Add(this.label2);
             this.Controls.Add(this.checkBoxDetection);
             this.Controls.Add(this.checkBoxCredit);
             this.Controls.Add(this.checkBoxResource);
@@ -171,5 +183,6 @@ private void InitializeComponent()
         private CheckBox checkBoxResource;
         private CheckBox checkBoxCredit;
         private CheckBox checkBoxDetection;
+        private Label label2;
     }
 }
\ No newline at end of file