diff --git a/backend/pkg/analytics/charts/metric_table.go b/backend/pkg/analytics/charts/metric_table.go
index 2927e062f..a456fa0ca 100644
--- a/backend/pkg/analytics/charts/metric_table.go
+++ b/backend/pkg/analytics/charts/metric_table.go
@@ -49,10 +49,10 @@ var propertySelectorMap = map[string]string{
 }
 
 var mainColumns = map[string]string{
-	"userBrowser": "main.$browser",
+	"userBrowser": "$browser",
 	"userDevice":  "sessions.user_device",
-	"referrer":    "main.$referrer",
-	"ISSUE":       "main.issue_type",
+	"referrer":    "$referrer",
+	"ISSUE":       "issue_type",
 }
 
 func (t TableQueryBuilder) Execute(p Payload, conn db.Connector) (interface{}, error) {
diff --git a/backend/pkg/analytics/charts/query.go b/backend/pkg/analytics/charts/query.go
index e28771e95..4d42469d5 100644
--- a/backend/pkg/analytics/charts/query.go
+++ b/backend/pkg/analytics/charts/query.go
@@ -78,8 +78,10 @@ func getColumnAccessor(logical string, isNumeric bool, opts BuildConditionsOptio
 	if col, ok := opts.DefinedColumns[logical]; ok {
 		col = quote(col)
 		if opts.MainTableAlias != "" {
-			//return fmt.Sprintf("%s.%s", opts.MainTableAlias, col)
-			return fmt.Sprintf("%s", col)
+			if strings.Contains(col, ".") {
+				return fmt.Sprintf("%s", col)
+			}
+			return fmt.Sprintf("%s.%s", opts.MainTableAlias, col)
 		}
 		return col
 	}