diff --git a/gr-jay/lib/peak_detect_impl.cc b/gr-jay/lib/peak_detect_impl.cc
index 2382425..1a004b3 100644
--- a/gr-jay/lib/peak_detect_impl.cc
+++ b/gr-jay/lib/peak_detect_impl.cc
@@ -290,6 +290,10 @@ namespace gr {
 				}
 				else
 				{
+					// Output OFF-tags
+					pmt::pmt_t tag_key = pmt::string_to_symbol(std::string("peak"));
+					pmt::pmt_t tag_value = pmt::string_to_symbol(std::string("id=") + std::to_string(peak.id) + std::string(":pos=") + std::to_string(peak.pos) + std::string(":state=") + std::string("OFF"));
+					add_item_tag(DATA, nitems_written(DATA) + k, tag_key, tag_value, m_tag_id);
 					fprintf(stderr, "Lost Peak #%u at %d\n", (int)peak.id, (int)peak.pos);
 				}
 			}
@@ -312,6 +316,11 @@ namespace gr {
 				if (!found)
 				{
 					temp.push_back(peak);
+
+					// Output ON-tags
+					pmt::pmt_t tag_key = pmt::string_to_symbol(std::string("peak"));
+					pmt::pmt_t tag_value = pmt::string_to_symbol(std::string("id=") + std::to_string(peak.id) + std::string(":pos=") + std::to_string(peak.pos) + std::string(":state=") + std::string("ON"));
+					add_item_tag(DATA, nitems_written(DATA) + k, tag_key, tag_value, m_tag_id);
 					fprintf(stderr, "New Peak #%u at %d\n", (int)peak.id, (int)peak.pos);
 				}
 			}
@@ -347,18 +356,6 @@ namespace gr {
 				*(optr_pbox++) = m_pPeakBox_abs[i];
 			}
 
-			// -----------------------------------------------------------------
-			// Output tags
-			// -----------------------------------------------------------------
-			for (int i = 0; i < m_peakHistory.size(); i++)
-			{
-				// Create peak tags
-				Peak &peak = m_peakHistory[i];
-				pmt::pmt_t tag_key = pmt::string_to_symbol(std::string("pos_id_") + std::to_string(peak.id));
-				pmt::pmt_t tag_value = pmt::from_long(peak.pos);
-				add_item_tag(DATA, nitems_written(DATA) + k, tag_key, tag_value, m_tag_id);
-			}
-
 			m_frameCount++;
 		}
 
diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index 213e8bb..230a7b6 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -826,7 +826,7 @@
     </param>
     <param>
       <key>display</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -850,7 +850,7 @@
     </param>
     <param>
       <key>filter</key>
-      <value>""</value>
+      <value>"peak"</value>
     </param>
     <param>
       <key>name</key>