diff --git a/api/chalicelib/core/alerts_processor.py b/api/chalicelib/core/alerts_processor.py
index 80973fadd..21249773c 100644
--- a/api/chalicelib/core/alerts_processor.py
+++ b/api/chalicelib/core/alerts_processor.py
@@ -119,12 +119,6 @@ def Build(a):
 
     q = f"""SELECT coalesce(value,0) AS value, coalesce(value,0) {a["query"]["operator"]} {a["query"]["right"]} AS valid"""
 
-    # if len(colDef.group) > 0 {
-    # subQ = subQ.Column(colDef.group + " AS group_value")
-    # subQ = subQ.GroupBy(colDef.group)
-    # q = q.Column("group_value")
-    # }
-
     if a["detectionMethod"] == schemas.AlertDetectionMethod.threshold:
         if a["seriesId"] is not None:
             q += f""" FROM ({subQ}) AS stat"""
@@ -134,16 +128,6 @@ def Build(a):
         params = {**params, **full_args, "startDate": TimeUTC.now() - a["options"]["currentPeriod"] * 60 * 1000}
     else:
         if a["options"]["change"] == schemas.AlertDetectionChangeType.change:
-            # if len(colDef.group) > 0:
-            # subq1 := subQ.Where(sq.Expr("timestamp>=$2 ", time.Now().Unix()-a.Options.CurrentPeriod * 60))
-            # sub2, args2, _ := subQ.Where(
-            # sq.And{
-            # sq.Expr("timestamp<$3 ", time.Now().Unix()-a.Options.CurrentPeriod * 60),
-            # sq.Expr("timestamp>=$4 ", time.Now().Unix()-2 * a.Options.CurrentPeriod * 60),
-            # }).ToSql()
-            # sub1 := sq.Select("group_value", "(stat1.value-stat2.value) AS value").FromSelect(subq1, "stat1").JoinClause("INNER JOIN ("+sub2+") AS stat2 USING(group_value)", args2...)
-            # q = q.FromSelect(sub1, "stat")
-            # else:
             if a["seriesId"] is not None:
                 sub2 = subQ.replace("%(startDate)s", "%(timestamp_sub2)s").replace("%(endDate)s", "%(startDate)s")
                 sub1 = f"SELECT (({subQ})-({sub2})) AS value"
@@ -163,16 +147,6 @@ def Build(a):
                 q += f" FROM ( {sub1} ) AS stat"
 
         else:
-            # if len(colDef.group) >0 {
-            # subq1 := subQ.Where(sq.Expr("timestamp>=$2 ", time.Now().Unix()-a.Options.CurrentPeriod * 60))
-            # sub2, args2, _ := subQ.Where(
-            # sq.And{
-            # sq.Expr("timestamp<$3 ", time.Now().Unix()-a.Options.CurrentPeriod * 60),
-            # sq.Expr("timestamp>=$4 ", time.Now().Unix()-a.Options.PreviousPeriod * 60-a.Options.CurrentPeriod * 60),
-            # }).ToSql()
-            # sub1 := sq.Select("group_value", "(stat1.value/stat2.value-1)*100 AS value").FromSelect(subq1, "stat1").JoinClause("INNER JOIN ("+sub2+") AS stat2 USING(group_value)", args2...)
-            # q = q.FromSelect(sub1, "stat")
-            # } else {
             if a["seriesId"] is not None:
                 sub2 = subQ.replace("%(startDate)s", "%(timestamp_sub2)s").replace("%(endDate)s", "%(startDate)s")
                 sub1 = f"SELECT (({subQ})/NULLIF(({sub2}),0)-1)*100 AS value"
diff --git a/api/chalicelib/core/custom_metrics.py b/api/chalicelib/core/custom_metrics.py
index 06a2c328b..6c8e7ddc3 100644
--- a/api/chalicelib/core/custom_metrics.py
+++ b/api/chalicelib/core/custom_metrics.py
@@ -288,6 +288,7 @@ def get_series_for_alert(project_id, user_id):
                              INNER JOIN metrics USING (metric_id)
                     WHERE metrics.deleted_at ISNULL
                       AND metrics.project_id = %(project_id)s
+                      AND metrics.metric_type = 'timeseries'
                       AND (user_id = %(user_id)s OR is_public)
                     ORDER BY name;""",
                 {"project_id": project_id, "user_id": user_id}
diff --git a/api/routers/core.py b/api/routers/core.py
index 8aacdb99b..d523176e1 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -101,7 +101,8 @@ def comment_assignment(projectId: int, sessionId: int, issueId: str, data: schem
 
 @app.get('/{projectId}/events/search', tags=["events"])
 def events_search(projectId: int, q: str,
-                  type: Union[schemas.FilterType, schemas.EventType, schemas.PerformanceEventType] = None,
+                  type: Union[schemas.FilterType, schemas.EventType,
+                              schemas.PerformanceEventType, schemas.FetchFilterType._url] = None,
                   key: str = None,
                   source: str = None, context: schemas.CurrentContext = Depends(OR_context)):
     if len(q) == 0:
@@ -114,7 +115,7 @@ def events_search(projectId: int, q: str,
                     schemas.PerformanceEventType.location_avg_memory_usage
                     ]:
             type = schemas.EventType.location
-        elif type in [schemas.PerformanceEventType.fetch_failed]:
+        elif type in [schemas.PerformanceEventType.fetch_failed, schemas.FetchFilterType._url]:
             type = schemas.EventType.request
         else:
             return {"data": []}