diff --git a/filters/filter_test.go b/filters/filter_test.go
index bcb4c43f8..f2e32cce8 100644
--- a/filters/filter_test.go
+++ b/filters/filter_test.go
@@ -112,6 +112,15 @@ func TestFilters(t *testing.T) {
 				corpus[8],
 			},
 		},
+		{
+			name:  "NameAndLabelPresent",
+			input: "labels.foo,name",
+			expected: []interface{}{
+				corpus[0],
+				corpus[2],
+				corpus[8],
+			},
+		},
 		{
 			name:  "LabelValue",
 			input: "labels.foo==true",
diff --git a/filters/parser.go b/filters/parser.go
index 4d8e0d663..2f1366b01 100644
--- a/filters/parser.go
+++ b/filters/parser.go
@@ -99,7 +99,7 @@ func (p *parser) selector() (selector, error) {
 	}
 
 	switch p.scanner.peek() {
-	case tokenSeparator, tokenEOF:
+	case ',', tokenSeparator, tokenEOF:
 		return selector{
 			fieldpath: fieldpath,
 			operator:  operatorPresent,