From 057e495d516fed1af2e789132bf99db09b3fae36 Mon Sep 17 00:00:00 2001
From: Marco polo <salazarm@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:59:11 -0600
Subject: [PATCH] [AssetSelection] Make operators case insensitive (#28300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary & Motivation

As titled making operators case insensitive

## How I Tested These Changes

jest + pytest + local testing

<img width="902" alt="Screenshot 2025-03-06 at 3 26 29 PM"
src="https://github.com/user-attachments/assets/568b696c-05ef-47fc-9539-f04afd0f8dab"
/>
---
 .../__tests__/AntlrAssetSelection.test.ts     |   7 +
 .../generated/AssetSelection.interp           |   8 +-
 .../generated/AssetSelection.tokens           |   5 +-
 .../generated/AssetSelectionLexer.interp      |  12 +-
 .../generated/AssetSelectionLexer.tokens      |   5 +-
 .../generated/AssetSelectionLexer.ts          | 186 ++---
 .../generated/AssetSelectionParser.ts         |  16 +-
 .../ui-core/src/asset-selection/util.ts       |   2 +-
 .../ui-core/src/op-selection/OpSelection.g4   |  10 +-
 .../op-selection/generated/OpSelection.interp |   8 +-
 .../op-selection/generated/OpSelection.tokens |   5 +-
 .../generated/OpSelectionLexer.interp         |  12 +-
 .../generated/OpSelectionLexer.tokens         |   5 +-
 .../generated/OpSelectionLexer.ts             | 102 +--
 .../generated/OpSelectionParser.ts            |  16 +-
 .../ui-core/src/run-selection/RunSelection.g4 |  10 +-
 .../generated/RunSelection.interp             |   8 +-
 .../generated/RunSelection.tokens             |   5 +-
 .../generated/RunSelectionLexer.interp        |  12 +-
 .../generated/RunSelectionLexer.tokens        |   5 +-
 .../generated/RunSelectionLexer.ts            | 114 +--
 .../generated/RunSelectionParser.ts           |  16 +-
 .../src/selection/SelectionAutoComplete.g4    |   6 +-
 .../generated/SelectionAutoComplete.interp    |   6 +-
 .../generated/SelectionAutoComplete.tokens    |   3 -
 .../SelectionAutoCompleteLexer.interp         |   8 +-
 .../SelectionAutoCompleteLexer.tokens         |   3 -
 .../generated/SelectionAutoCompleteLexer.ts   |  88 +--
 .../generated/SelectionAutoCompleteParser.ts  |   6 +-
 .../antlr_asset_selection/AssetSelection.g4   |   6 +-
 .../generated/AssetSelection.interp           |   6 +-
 .../generated/AssetSelection.tokens           |   3 -
 .../generated/AssetSelectionLexer.interp      |   8 +-
 .../generated/AssetSelectionLexer.py          | 701 ++++++++++--------
 .../generated/AssetSelectionLexer.tokens      |   3 -
 .../generated/AssetSelectionParser.py         |   6 +-
 .../test_antlr_asset_selection.py             |  15 +
 37 files changed, 778 insertions(+), 659 deletions(-)

diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/__tests__/AntlrAssetSelection.test.ts b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/__tests__/AntlrAssetSelection.test.ts
index 829c14c95065a..d9b971843cac5 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/__tests__/AntlrAssetSelection.test.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/__tests__/AntlrAssetSelection.test.ts
@@ -96,6 +96,11 @@ describe('parseAssetSelectionQuery', () => {
       assertQueryResult('(key:A or key:B) and (key:B or key:C)', ['B']);
     });
 
+    it('should parse not query', () => {
+      assertQueryResult('not key:A', ['B', 'B2', 'C']);
+      assertQueryResult('NOT key:A', ['B', 'B2', 'C']);
+    });
+
     it('should parse upstream plus query', () => {
       assertQueryResult('1+key:A', ['A']);
       assertQueryResult('1+key:B', ['A', 'B']);
@@ -127,12 +132,14 @@ describe('parseAssetSelectionQuery', () => {
       assertQueryResult('+key:B+', ['A', 'B', 'C']);
       assertQueryResult('key:A+ and +key:C and +key:B+', ['A', 'B', 'C']);
       assertQueryResult('key:A+ and +key:B+ and +key:C', ['A', 'B', 'C']);
+      assertQueryResult('key:A+ AND +key:B+ AND +key:C', ['A', 'B', 'C']);
     });
 
     it('should parse sinks query', () => {
       assertQueryResult('sinks(*)', ['C']);
       assertQueryResult('sinks(key:A)', ['A']);
       assertQueryResult('sinks(key:A or key:B)', ['B']);
+      assertQueryResult('sinks(key:A OR key:B)', ['B']);
     });
 
     it('should parse roots query', () => {
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.interp b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.interp
index eaef680e4eaca..dfaf559329b95 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.interp
@@ -1,9 +1,9 @@
 token literal names:
 null
 '='
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -55,7 +55,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.tokens b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.tokens
index 55e8b34a6ee53..5ce47397a8001 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelection.tokens
@@ -23,12 +23,9 @@ SINKS=22
 ROOTS=23
 QUOTED_STRING=24
 UNQUOTED_STRING=25
-UNQUOTED_REGEX_STRING=26
+UNQUOTED_WILDCARD_STRING=26
 WS=27
 '='=1
-'and'=2
-'or'=3
-'not'=4
 '*'=5
 '+'=6
 ':'=8
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.interp b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.interp
index 38efc35904b52..db48a47268323 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.interp
@@ -1,9 +1,9 @@
 token literal names:
 null
 '='
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -55,7 +55,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
@@ -84,7 +84,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 channel names:
@@ -95,4 +95,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 29, 215, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 6, 8, 76, 10, 8, 13, 8, 14, 8, 77, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 7, 25, 188, 10, 25, 12, 25, 14, 25, 191, 11, 25, 3, 25, 3, 25, 3, 26, 3, 26, 7, 26, 197, 10, 26, 12, 26, 14, 26, 200, 11, 26, 3, 27, 3, 27, 7, 27, 204, 10, 27, 12, 27, 14, 27, 207, 11, 27, 3, 28, 6, 28, 210, 10, 28, 13, 28, 14, 28, 211, 3, 28, 3, 28, 2, 2, 2, 29, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 219, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 3, 57, 3, 2, 2, 2, 5, 59, 3, 2, 2, 2, 7, 63, 3, 2, 2, 2, 9, 66, 3, 2, 2, 2, 11, 70, 3, 2, 2, 2, 13, 72, 3, 2, 2, 2, 15, 75, 3, 2, 2, 2, 17, 79, 3, 2, 2, 2, 19, 81, 3, 2, 2, 2, 21, 83, 3, 2, 2, 2, 23, 85, 3, 2, 2, 2, 25, 87, 3, 2, 2, 2, 27, 91, 3, 2, 2, 2, 29, 97, 3, 2, 2, 2, 31, 103, 3, 2, 2, 2, 33, 107, 3, 2, 2, 2, 35, 112, 3, 2, 2, 2, 37, 126, 3, 2, 2, 2, 39, 133, 3, 2, 2, 2, 41, 144, 3, 2, 2, 2, 43, 155, 3, 2, 2, 2, 45, 173, 3, 2, 2, 2, 47, 179, 3, 2, 2, 2, 49, 185, 3, 2, 2, 2, 51, 194, 3, 2, 2, 2, 53, 201, 3, 2, 2, 2, 55, 209, 3, 2, 2, 2, 57, 58, 7, 63, 2, 2, 58, 4, 3, 2, 2, 2, 59, 60, 7, 99, 2, 2, 60, 61, 7, 112, 2, 2, 61, 62, 7, 102, 2, 2, 62, 6, 3, 2, 2, 2, 63, 64, 7, 113, 2, 2, 64, 65, 7, 116, 2, 2, 65, 8, 3, 2, 2, 2, 66, 67, 7, 112, 2, 2, 67, 68, 7, 113, 2, 2, 68, 69, 7, 118, 2, 2, 69, 10, 3, 2, 2, 2, 70, 71, 7, 44, 2, 2, 71, 12, 3, 2, 2, 2, 72, 73, 7, 45, 2, 2, 73, 14, 3, 2, 2, 2, 74, 76, 9, 2, 2, 2, 75, 74, 3, 2, 2, 2, 76, 77, 3, 2, 2, 2, 77, 75, 3, 2, 2, 2, 77, 78, 3, 2, 2, 2, 78, 16, 3, 2, 2, 2, 79, 80, 7, 60, 2, 2, 80, 18, 3, 2, 2, 2, 81, 82, 7, 42, 2, 2, 82, 20, 3, 2, 2, 2, 83, 84, 7, 43, 2, 2, 84, 22, 3, 2, 2, 2, 85, 86, 7, 46, 2, 2, 86, 24, 3, 2, 2, 2, 87, 88, 7, 109, 2, 2, 88, 89, 7, 103, 2, 2, 89, 90, 7, 123, 2, 2, 90, 26, 3, 2, 2, 2, 91, 92, 7, 113, 2, 2, 92, 93, 7, 121, 2, 2, 93, 94, 7, 112, 2, 2, 94, 95, 7, 103, 2, 2, 95, 96, 7, 116, 2, 2, 96, 28, 3, 2, 2, 2, 97, 98, 7, 105, 2, 2, 98, 99, 7, 116, 2, 2, 99, 100, 7, 113, 2, 2, 100, 101, 7, 119, 2, 2, 101, 102, 7, 114, 2, 2, 102, 30, 3, 2, 2, 2, 103, 104, 7, 118, 2, 2, 104, 105, 7, 99, 2, 2, 105, 106, 7, 105, 2, 2, 106, 32, 3, 2, 2, 2, 107, 108, 7, 109, 2, 2, 108, 109, 7, 107, 2, 2, 109, 110, 7, 112, 2, 2, 110, 111, 7, 102, 2, 2, 111, 34, 3, 2, 2, 2, 112, 113, 7, 101, 2, 2, 113, 114, 7, 113, 2, 2, 114, 115, 7, 102, 2, 2, 115, 116, 7, 103, 2, 2, 116, 117, 7, 97, 2, 2, 117, 118, 7, 110, 2, 2, 118, 119, 7, 113, 2, 2, 119, 120, 7, 101, 2, 2, 120, 121, 7, 99, 2, 2, 121, 122, 7, 118, 2, 2, 122, 123, 7, 107, 2, 2, 123, 124, 7, 113, 2, 2, 124, 125, 7, 112, 2, 2, 125, 36, 3, 2, 2, 2, 126, 127, 7, 101, 2, 2, 127, 128, 7, 113, 2, 2, 128, 129, 7, 110, 2, 2, 129, 130, 7, 119, 2, 2, 130, 131, 7, 111, 2, 2, 131, 132, 7, 112, 2, 2, 132, 38, 3, 2, 2, 2, 133, 134, 7, 118, 2, 2, 134, 135, 7, 99, 2, 2, 135, 136, 7, 100, 2, 2, 136, 137, 7, 110, 2, 2, 137, 138, 7, 103, 2, 2, 138, 139, 7, 97, 2, 2, 139, 140, 7, 112, 2, 2, 140, 141, 7, 99, 2, 2, 141, 142, 7, 111, 2, 2, 142, 143, 7, 103, 2, 2, 143, 40, 3, 2, 2, 2, 144, 145, 7, 101, 2, 2, 145, 146, 7, 113, 2, 2, 146, 147, 7, 110, 2, 2, 147, 148, 7, 119, 2, 2, 148, 149, 7, 111, 2, 2, 149, 150, 7, 112, 2, 2, 150, 151, 7, 97, 2, 2, 151, 152, 7, 118, 2, 2, 152, 153, 7, 99, 2, 2, 153, 154, 7, 105, 2, 2, 154, 42, 3, 2, 2, 2, 155, 156, 7, 101, 2, 2, 156, 157, 7, 106, 2, 2, 157, 158, 7, 99, 2, 2, 158, 159, 7, 112, 2, 2, 159, 160, 7, 105, 2, 2, 160, 161, 7, 103, 2, 2, 161, 162, 7, 102, 2, 2, 162, 163, 7, 97, 2, 2, 163, 164, 7, 107, 2, 2, 164, 165, 7, 112, 2, 2, 165, 166, 7, 97, 2, 2, 166, 167, 7, 100, 2, 2, 167, 168, 7, 116, 2, 2, 168, 169, 7, 99, 2, 2, 169, 170, 7, 112, 2, 2, 170, 171, 7, 101, 2, 2, 171, 172, 7, 106, 2, 2, 172, 44, 3, 2, 2, 2, 173, 174, 7, 117, 2, 2, 174, 175, 7, 107, 2, 2, 175, 176, 7, 112, 2, 2, 176, 177, 7, 109, 2, 2, 177, 178, 7, 117, 2, 2, 178, 46, 3, 2, 2, 2, 179, 180, 7, 116, 2, 2, 180, 181, 7, 113, 2, 2, 181, 182, 7, 113, 2, 2, 182, 183, 7, 118, 2, 2, 183, 184, 7, 117, 2, 2, 184, 48, 3, 2, 2, 2, 185, 189, 7, 36, 2, 2, 186, 188, 10, 3, 2, 2, 187, 186, 3, 2, 2, 2, 188, 191, 3, 2, 2, 2, 189, 187, 3, 2, 2, 2, 189, 190, 3, 2, 2, 2, 190, 192, 3, 2, 2, 2, 191, 189, 3, 2, 2, 2, 192, 193, 7, 36, 2, 2, 193, 50, 3, 2, 2, 2, 194, 198, 9, 4, 2, 2, 195, 197, 9, 5, 2, 2, 196, 195, 3, 2, 2, 2, 197, 200, 3, 2, 2, 2, 198, 196, 3, 2, 2, 2, 198, 199, 3, 2, 2, 2, 199, 52, 3, 2, 2, 2, 200, 198, 3, 2, 2, 2, 201, 205, 9, 6, 2, 2, 202, 204, 9, 7, 2, 2, 203, 202, 3, 2, 2, 2, 204, 207, 3, 2, 2, 2, 205, 203, 3, 2, 2, 2, 205, 206, 3, 2, 2, 2, 206, 54, 3, 2, 2, 2, 207, 205, 3, 2, 2, 2, 208, 210, 9, 8, 2, 2, 209, 208, 3, 2, 2, 2, 210, 211, 3, 2, 2, 2, 211, 209, 3, 2, 2, 2, 211, 212, 3, 2, 2, 2, 212, 213, 3, 2, 2, 2, 213, 214, 8, 28, 2, 2, 214, 56, 3, 2, 2, 2, 8, 2, 77, 189, 198, 205, 211, 3, 8, 2, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 29, 226, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 66, 10, 3, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 72, 10, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 80, 10, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 6, 8, 87, 10, 8, 13, 8, 14, 8, 88, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 7, 25, 199, 10, 25, 12, 25, 14, 25, 202, 11, 25, 3, 25, 3, 25, 3, 26, 3, 26, 7, 26, 208, 10, 26, 12, 26, 14, 26, 211, 11, 26, 3, 27, 3, 27, 7, 27, 215, 10, 27, 12, 27, 14, 27, 218, 11, 27, 3, 28, 6, 28, 221, 10, 28, 13, 28, 14, 28, 222, 3, 28, 3, 28, 2, 2, 2, 29, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 37, 2, 20, 39, 2, 21, 41, 2, 22, 43, 2, 23, 45, 2, 24, 47, 2, 25, 49, 2, 26, 51, 2, 27, 53, 2, 28, 55, 2, 29, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 233, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 2, 37, 3, 2, 2, 2, 2, 39, 3, 2, 2, 2, 2, 41, 3, 2, 2, 2, 2, 43, 3, 2, 2, 2, 2, 45, 3, 2, 2, 2, 2, 47, 3, 2, 2, 2, 2, 49, 3, 2, 2, 2, 2, 51, 3, 2, 2, 2, 2, 53, 3, 2, 2, 2, 2, 55, 3, 2, 2, 2, 3, 57, 3, 2, 2, 2, 5, 65, 3, 2, 2, 2, 7, 71, 3, 2, 2, 2, 9, 79, 3, 2, 2, 2, 11, 81, 3, 2, 2, 2, 13, 83, 3, 2, 2, 2, 15, 86, 3, 2, 2, 2, 17, 90, 3, 2, 2, 2, 19, 92, 3, 2, 2, 2, 21, 94, 3, 2, 2, 2, 23, 96, 3, 2, 2, 2, 25, 98, 3, 2, 2, 2, 27, 102, 3, 2, 2, 2, 29, 108, 3, 2, 2, 2, 31, 114, 3, 2, 2, 2, 33, 118, 3, 2, 2, 2, 35, 123, 3, 2, 2, 2, 37, 137, 3, 2, 2, 2, 39, 144, 3, 2, 2, 2, 41, 155, 3, 2, 2, 2, 43, 166, 3, 2, 2, 2, 45, 184, 3, 2, 2, 2, 47, 190, 3, 2, 2, 2, 49, 196, 3, 2, 2, 2, 51, 205, 3, 2, 2, 2, 53, 212, 3, 2, 2, 2, 55, 220, 3, 2, 2, 2, 57, 58, 7, 63, 2, 2, 58, 4, 3, 2, 2, 2, 59, 60, 7, 99, 2, 2, 60, 61, 7, 112, 2, 2, 61, 66, 7, 102, 2, 2, 62, 63, 7, 67, 2, 2, 63, 64, 7, 80, 2, 2, 64, 66, 7, 70, 2, 2, 65, 59, 3, 2, 2, 2, 65, 62, 3, 2, 2, 2, 66, 6, 3, 2, 2, 2, 67, 68, 7, 113, 2, 2, 68, 72, 7, 116, 2, 2, 69, 70, 7, 81, 2, 2, 70, 72, 7, 84, 2, 2, 71, 67, 3, 2, 2, 2, 71, 69, 3, 2, 2, 2, 72, 8, 3, 2, 2, 2, 73, 74, 7, 112, 2, 2, 74, 75, 7, 113, 2, 2, 75, 80, 7, 118, 2, 2, 76, 77, 7, 80, 2, 2, 77, 78, 7, 81, 2, 2, 78, 80, 7, 86, 2, 2, 79, 73, 3, 2, 2, 2, 79, 76, 3, 2, 2, 2, 80, 10, 3, 2, 2, 2, 81, 82, 7, 44, 2, 2, 82, 12, 3, 2, 2, 2, 83, 84, 7, 45, 2, 2, 84, 14, 3, 2, 2, 2, 85, 87, 9, 2, 2, 2, 86, 85, 3, 2, 2, 2, 87, 88, 3, 2, 2, 2, 88, 86, 3, 2, 2, 2, 88, 89, 3, 2, 2, 2, 89, 16, 3, 2, 2, 2, 90, 91, 7, 60, 2, 2, 91, 18, 3, 2, 2, 2, 92, 93, 7, 42, 2, 2, 93, 20, 3, 2, 2, 2, 94, 95, 7, 43, 2, 2, 95, 22, 3, 2, 2, 2, 96, 97, 7, 46, 2, 2, 97, 24, 3, 2, 2, 2, 98, 99, 7, 109, 2, 2, 99, 100, 7, 103, 2, 2, 100, 101, 7, 123, 2, 2, 101, 26, 3, 2, 2, 2, 102, 103, 7, 113, 2, 2, 103, 104, 7, 121, 2, 2, 104, 105, 7, 112, 2, 2, 105, 106, 7, 103, 2, 2, 106, 107, 7, 116, 2, 2, 107, 28, 3, 2, 2, 2, 108, 109, 7, 105, 2, 2, 109, 110, 7, 116, 2, 2, 110, 111, 7, 113, 2, 2, 111, 112, 7, 119, 2, 2, 112, 113, 7, 114, 2, 2, 113, 30, 3, 2, 2, 2, 114, 115, 7, 118, 2, 2, 115, 116, 7, 99, 2, 2, 116, 117, 7, 105, 2, 2, 117, 32, 3, 2, 2, 2, 118, 119, 7, 109, 2, 2, 119, 120, 7, 107, 2, 2, 120, 121, 7, 112, 2, 2, 121, 122, 7, 102, 2, 2, 122, 34, 3, 2, 2, 2, 123, 124, 7, 101, 2, 2, 124, 125, 7, 113, 2, 2, 125, 126, 7, 102, 2, 2, 126, 127, 7, 103, 2, 2, 127, 128, 7, 97, 2, 2, 128, 129, 7, 110, 2, 2, 129, 130, 7, 113, 2, 2, 130, 131, 7, 101, 2, 2, 131, 132, 7, 99, 2, 2, 132, 133, 7, 118, 2, 2, 133, 134, 7, 107, 2, 2, 134, 135, 7, 113, 2, 2, 135, 136, 7, 112, 2, 2, 136, 36, 3, 2, 2, 2, 137, 138, 7, 101, 2, 2, 138, 139, 7, 113, 2, 2, 139, 140, 7, 110, 2, 2, 140, 141, 7, 119, 2, 2, 141, 142, 7, 111, 2, 2, 142, 143, 7, 112, 2, 2, 143, 38, 3, 2, 2, 2, 144, 145, 7, 118, 2, 2, 145, 146, 7, 99, 2, 2, 146, 147, 7, 100, 2, 2, 147, 148, 7, 110, 2, 2, 148, 149, 7, 103, 2, 2, 149, 150, 7, 97, 2, 2, 150, 151, 7, 112, 2, 2, 151, 152, 7, 99, 2, 2, 152, 153, 7, 111, 2, 2, 153, 154, 7, 103, 2, 2, 154, 40, 3, 2, 2, 2, 155, 156, 7, 101, 2, 2, 156, 157, 7, 113, 2, 2, 157, 158, 7, 110, 2, 2, 158, 159, 7, 119, 2, 2, 159, 160, 7, 111, 2, 2, 160, 161, 7, 112, 2, 2, 161, 162, 7, 97, 2, 2, 162, 163, 7, 118, 2, 2, 163, 164, 7, 99, 2, 2, 164, 165, 7, 105, 2, 2, 165, 42, 3, 2, 2, 2, 166, 167, 7, 101, 2, 2, 167, 168, 7, 106, 2, 2, 168, 169, 7, 99, 2, 2, 169, 170, 7, 112, 2, 2, 170, 171, 7, 105, 2, 2, 171, 172, 7, 103, 2, 2, 172, 173, 7, 102, 2, 2, 173, 174, 7, 97, 2, 2, 174, 175, 7, 107, 2, 2, 175, 176, 7, 112, 2, 2, 176, 177, 7, 97, 2, 2, 177, 178, 7, 100, 2, 2, 178, 179, 7, 116, 2, 2, 179, 180, 7, 99, 2, 2, 180, 181, 7, 112, 2, 2, 181, 182, 7, 101, 2, 2, 182, 183, 7, 106, 2, 2, 183, 44, 3, 2, 2, 2, 184, 185, 7, 117, 2, 2, 185, 186, 7, 107, 2, 2, 186, 187, 7, 112, 2, 2, 187, 188, 7, 109, 2, 2, 188, 189, 7, 117, 2, 2, 189, 46, 3, 2, 2, 2, 190, 191, 7, 116, 2, 2, 191, 192, 7, 113, 2, 2, 192, 193, 7, 113, 2, 2, 193, 194, 7, 118, 2, 2, 194, 195, 7, 117, 2, 2, 195, 48, 3, 2, 2, 2, 196, 200, 7, 36, 2, 2, 197, 199, 10, 3, 2, 2, 198, 197, 3, 2, 2, 2, 199, 202, 3, 2, 2, 2, 200, 198, 3, 2, 2, 2, 200, 201, 3, 2, 2, 2, 201, 203, 3, 2, 2, 2, 202, 200, 3, 2, 2, 2, 203, 204, 7, 36, 2, 2, 204, 50, 3, 2, 2, 2, 205, 209, 9, 4, 2, 2, 206, 208, 9, 5, 2, 2, 207, 206, 3, 2, 2, 2, 208, 211, 3, 2, 2, 2, 209, 207, 3, 2, 2, 2, 209, 210, 3, 2, 2, 2, 210, 52, 3, 2, 2, 2, 211, 209, 3, 2, 2, 2, 212, 216, 9, 6, 2, 2, 213, 215, 9, 7, 2, 2, 214, 213, 3, 2, 2, 2, 215, 218, 3, 2, 2, 2, 216, 214, 3, 2, 2, 2, 216, 217, 3, 2, 2, 2, 217, 54, 3, 2, 2, 2, 218, 216, 3, 2, 2, 2, 219, 221, 9, 8, 2, 2, 220, 219, 3, 2, 2, 2, 221, 222, 3, 2, 2, 2, 222, 220, 3, 2, 2, 2, 222, 223, 3, 2, 2, 2, 223, 224, 3, 2, 2, 2, 224, 225, 8, 28, 2, 2, 225, 56, 3, 2, 2, 2, 11, 2, 65, 71, 79, 88, 200, 209, 216, 222, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.tokens b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.tokens
index 55e8b34a6ee53..5ce47397a8001 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.tokens
@@ -23,12 +23,9 @@ SINKS=22
 ROOTS=23
 QUOTED_STRING=24
 UNQUOTED_STRING=25
-UNQUOTED_REGEX_STRING=26
+UNQUOTED_WILDCARD_STRING=26
 WS=27
 '='=1
-'and'=2
-'or'=3
-'not'=4
 '*'=5
 '+'=6
 ':'=8
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.ts b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.ts
index 0029e499dc9a8..be419989f215d 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionLexer.ts
@@ -35,7 +35,7 @@ export class AssetSelectionLexer extends Lexer {
   public static readonly ROOTS = 23;
   public static readonly QUOTED_STRING = 24;
   public static readonly UNQUOTED_STRING = 25;
-  public static readonly UNQUOTED_REGEX_STRING = 26;
+  public static readonly UNQUOTED_WILDCARD_STRING = 26;
   public static readonly WS = 27;
 
   // tslint:disable:no-trailing-whitespace
@@ -70,16 +70,16 @@ export class AssetSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
     "'='",
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -127,7 +127,7 @@ export class AssetSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -174,97 +174,103 @@ export class AssetSelectionLexer extends Lexer {
   }
 
   public static readonly _serializedATN: string =
-    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x1D\xD7\b\x01' +
+    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x1D\xE2\b\x01' +
     '\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06' +
     '\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r' +
     '\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t' +
     '\x12\x04\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04\x17\t' +
     '\x17\x04\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x04\x1B\t\x1B\x04\x1C\t' +
-    '\x1C\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03' +
-    '\x04\x03\x05\x03\x05\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x03\x07\x03' +
-    '\b\x06\bL\n\b\r\b\x0E\bM\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x03\f\x03' +
-    '\f\x03\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03' +
-    '\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x10\x03\x10\x03' +
-    '\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x12\x03\x12\x03' +
+    '\x1C\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x03\x05' +
+    '\x03B\n\x03\x03\x04\x03\x04\x03\x04\x03\x04\x05\x04H\n\x04\x03\x05\x03' +
+    '\x05\x03\x05\x03\x05\x03\x05\x03\x05\x05\x05P\n\x05\x03\x06\x03\x06\x03' +
+    '\x07\x03\x07\x03\b\x06\bW\n\b\r\b\x0E\bX\x03\t\x03\t\x03\n\x03\n\x03\v' +
+    '\x03\v\x03\f\x03\f\x03\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0E\x03' +
+    '\x0E\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03' +
+    '\x10\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03' +
     '\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03' +
-    '\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03' +
-    '\x13\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03' +
-    '\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03' +
-    '\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03\x16\x03' +
+    '\x12\x03\x12\x03\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03' +
+    '\x13\x03\x13\x03\x13\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03' +
+    '\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15\x03\x15\x03\x15\x03' +
+    '\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03' +
     '\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03' +
-    '\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03\x17\x03\x17\x03' +
-    '\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x03\x19\x03' +
-    '\x19\x07\x19\xBC\n\x19\f\x19\x0E\x19\xBF\v\x19\x03\x19\x03\x19\x03\x1A' +
-    '\x03\x1A\x07\x1A\xC5\n\x1A\f\x1A\x0E\x1A\xC8\v\x1A\x03\x1B\x03\x1B\x07' +
-    '\x1B\xCC\n\x1B\f\x1B\x0E\x1B\xCF\v\x1B\x03\x1C\x06\x1C\xD2\n\x1C\r\x1C' +
-    '\x0E\x1C\xD3\x03\x1C\x03\x1C\x02\x02\x02\x1D\x03\x02\x03\x05\x02\x04\x07' +
-    '\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15' +
-    '\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02' +
-    "\x12#\x02\x13%\x02\x14'\x02\x15)\x02\x16+\x02\x17-\x02\x18/\x02\x191" +
-    '\x02\x1A3\x02\x1B5\x02\x1C7\x02\x1D\x03\x02\t\x03\x022;\x06\x02\f\f\x0F' +
-    '\x0F$$^^\x05\x02C\\aac|\x06\x022;C\\aac|\x06\x02,,C\\aac|\x07\x02,,2;' +
-    'C\\aac|\x05\x02\v\f\x0F\x0F""\x02\xDB\x02\x03\x03\x02\x02\x02\x02\x05' +
-    '\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02\x02\x02\v\x03' +
-    '\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02\x11\x03' +
-    '\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02\x17\x03' +
-    '\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02\x1D\x03' +
-    '\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02\x02#\x03\x02' +
-    "\x02\x02\x02%\x03\x02\x02\x02\x02'\x03\x02\x02\x02\x02)\x03\x02\x02\x02" +
-    '\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03\x02\x02\x02\x021\x03' +
-    '\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02\x02\x027\x03\x02\x02' +
-    '\x02\x039\x03\x02\x02\x02\x05;\x03\x02\x02\x02\x07?\x03\x02\x02\x02\t' +
-    'B\x03\x02\x02\x02\vF\x03\x02\x02\x02\rH\x03\x02\x02\x02\x0FK\x03\x02\x02' +
-    '\x02\x11O\x03\x02\x02\x02\x13Q\x03\x02\x02\x02\x15S\x03\x02\x02\x02\x17' +
-    'U\x03\x02\x02\x02\x19W\x03\x02\x02\x02\x1B[\x03\x02\x02\x02\x1Da\x03\x02' +
-    '\x02\x02\x1Fg\x03\x02\x02\x02!k\x03\x02\x02\x02#p\x03\x02\x02\x02%~\x03' +
-    "\x02\x02\x02'\x85\x03\x02\x02\x02)\x90\x03\x02\x02\x02+\x9B\x03\x02\x02" +
-    '\x02-\xAD\x03\x02\x02\x02/\xB3\x03\x02\x02\x021\xB9\x03\x02\x02\x023\xC2' +
-    '\x03\x02\x02\x025\xC9\x03\x02\x02\x027\xD1\x03\x02\x02\x029:\x07?\x02' +
-    '\x02:\x04\x03\x02\x02\x02;<\x07c\x02\x02<=\x07p\x02\x02=>\x07f\x02\x02' +
-    '>\x06\x03\x02\x02\x02?@\x07q\x02\x02@A\x07t\x02\x02A\b\x03\x02\x02\x02' +
-    'BC\x07p\x02\x02CD\x07q\x02\x02DE\x07v\x02\x02E\n\x03\x02\x02\x02FG\x07' +
-    ',\x02\x02G\f\x03\x02\x02\x02HI\x07-\x02\x02I\x0E\x03\x02\x02\x02JL\t\x02' +
-    '\x02\x02KJ\x03\x02\x02\x02LM\x03\x02\x02\x02MK\x03\x02\x02\x02MN\x03\x02' +
-    '\x02\x02N\x10\x03\x02\x02\x02OP\x07<\x02\x02P\x12\x03\x02\x02\x02QR\x07' +
-    '*\x02\x02R\x14\x03\x02\x02\x02ST\x07+\x02\x02T\x16\x03\x02\x02\x02UV\x07' +
-    '.\x02\x02V\x18\x03\x02\x02\x02WX\x07m\x02\x02XY\x07g\x02\x02YZ\x07{\x02' +
-    '\x02Z\x1A\x03\x02\x02\x02[\\\x07q\x02\x02\\]\x07y\x02\x02]^\x07p\x02\x02' +
-    '^_\x07g\x02\x02_`\x07t\x02\x02`\x1C\x03\x02\x02\x02ab\x07i\x02\x02bc\x07' +
-    't\x02\x02cd\x07q\x02\x02de\x07w\x02\x02ef\x07r\x02\x02f\x1E\x03\x02\x02' +
-    '\x02gh\x07v\x02\x02hi\x07c\x02\x02ij\x07i\x02\x02j \x03\x02\x02\x02kl' +
-    '\x07m\x02\x02lm\x07k\x02\x02mn\x07p\x02\x02no\x07f\x02\x02o"\x03\x02' +
-    '\x02\x02pq\x07e\x02\x02qr\x07q\x02\x02rs\x07f\x02\x02st\x07g\x02\x02t' +
-    'u\x07a\x02\x02uv\x07n\x02\x02vw\x07q\x02\x02wx\x07e\x02\x02xy\x07c\x02' +
-    '\x02yz\x07v\x02\x02z{\x07k\x02\x02{|\x07q\x02\x02|}\x07p\x02\x02}$\x03' +
-    '\x02\x02\x02~\x7F\x07e\x02\x02\x7F\x80\x07q\x02\x02\x80\x81\x07n\x02\x02' +
-    '\x81\x82\x07w\x02\x02\x82\x83\x07o\x02\x02\x83\x84\x07p\x02\x02\x84&\x03' +
-    '\x02\x02\x02\x85\x86\x07v\x02\x02\x86\x87\x07c\x02\x02\x87\x88\x07d\x02' +
-    '\x02\x88\x89\x07n\x02\x02\x89\x8A\x07g\x02\x02\x8A\x8B\x07a\x02\x02\x8B' +
-    '\x8C\x07p\x02\x02\x8C\x8D\x07c\x02\x02\x8D\x8E\x07o\x02\x02\x8E\x8F\x07' +
-    'g\x02\x02\x8F(\x03\x02\x02\x02\x90\x91\x07e\x02\x02\x91\x92\x07q\x02\x02' +
-    '\x92\x93\x07n\x02\x02\x93\x94\x07w\x02\x02\x94\x95\x07o\x02\x02\x95\x96' +
-    '\x07p\x02\x02\x96\x97\x07a\x02\x02\x97\x98\x07v\x02\x02\x98\x99\x07c\x02' +
-    '\x02\x99\x9A\x07i\x02\x02\x9A*\x03\x02\x02\x02\x9B\x9C\x07e\x02\x02\x9C' +
-    '\x9D\x07j\x02\x02\x9D\x9E\x07c\x02\x02\x9E\x9F\x07p\x02\x02\x9F\xA0\x07' +
-    'i\x02\x02\xA0\xA1\x07g\x02\x02\xA1\xA2\x07f\x02\x02\xA2\xA3\x07a\x02\x02' +
-    '\xA3\xA4\x07k\x02\x02\xA4\xA5\x07p\x02\x02\xA5\xA6\x07a\x02\x02\xA6\xA7' +
-    '\x07d\x02\x02\xA7\xA8\x07t\x02\x02\xA8\xA9\x07c\x02\x02\xA9\xAA\x07p\x02' +
-    '\x02\xAA\xAB\x07e\x02\x02\xAB\xAC\x07j\x02\x02\xAC,\x03\x02\x02\x02\xAD' +
-    '\xAE\x07u\x02\x02\xAE\xAF\x07k\x02\x02\xAF\xB0\x07p\x02\x02\xB0\xB1\x07' +
-    'm\x02\x02\xB1\xB2\x07u\x02\x02\xB2.\x03\x02\x02\x02\xB3\xB4\x07t\x02\x02' +
-    '\xB4\xB5\x07q\x02\x02\xB5\xB6\x07q\x02\x02\xB6\xB7\x07v\x02\x02\xB7\xB8' +
-    '\x07u\x02\x02\xB80\x03\x02\x02\x02\xB9\xBD\x07$\x02\x02\xBA\xBC\n\x03' +
-    '\x02\x02\xBB\xBA\x03\x02\x02\x02\xBC\xBF\x03\x02\x02\x02\xBD\xBB\x03\x02' +
-    '\x02\x02\xBD\xBE\x03\x02\x02\x02\xBE\xC0\x03\x02\x02\x02\xBF\xBD\x03\x02' +
-    '\x02\x02\xC0\xC1\x07$\x02\x02\xC12\x03\x02\x02\x02\xC2\xC6\t\x04\x02\x02' +
-    '\xC3\xC5\t\x05\x02\x02\xC4\xC3\x03\x02\x02\x02\xC5\xC8\x03\x02\x02\x02' +
-    '\xC6\xC4\x03\x02\x02\x02\xC6\xC7\x03\x02\x02\x02\xC74\x03\x02\x02\x02' +
-    '\xC8\xC6\x03\x02\x02\x02\xC9\xCD\t\x06\x02\x02\xCA\xCC\t\x07\x02\x02\xCB' +
-    '\xCA\x03\x02\x02\x02\xCC\xCF\x03\x02\x02\x02\xCD\xCB\x03\x02\x02\x02\xCD' +
-    '\xCE\x03\x02\x02\x02\xCE6\x03\x02\x02\x02\xCF\xCD\x03\x02\x02\x02\xD0' +
-    '\xD2\t\b\x02\x02\xD1\xD0\x03\x02\x02\x02\xD2\xD3\x03\x02\x02\x02\xD3\xD1' +
-    '\x03\x02\x02\x02\xD3\xD4\x03\x02\x02\x02\xD4\xD5\x03\x02\x02\x02\xD5\xD6' +
-    '\b\x1C\x02\x02\xD68\x03\x02\x02\x02\b\x02M\xBD\xC6\xCD\xD3\x03\b\x02\x02';
+    '\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x16\x03\x17\x03\x17\x03' +
+    '\x17\x03\x17\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x03' +
+    '\x18\x03\x19\x03\x19\x07\x19\xC7\n\x19\f\x19\x0E\x19\xCA\v\x19\x03\x19' +
+    '\x03\x19\x03\x1A\x03\x1A\x07\x1A\xD0\n\x1A\f\x1A\x0E\x1A\xD3\v\x1A\x03' +
+    '\x1B\x03\x1B\x07\x1B\xD7\n\x1B\f\x1B\x0E\x1B\xDA\v\x1B\x03\x1C\x06\x1C' +
+    '\xDD\n\x1C\r\x1C\x0E\x1C\xDE\x03\x1C\x03\x1C\x02\x02\x02\x1D\x03\x02\x03' +
+    '\x05\x02\x04\x07\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02' +
+    '\n\x13\x02\v\x15\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F' +
+    "\x02\x11!\x02\x12#\x02\x13%\x02\x14'\x02\x15)\x02\x16+\x02\x17-\x02\x18" +
+    '/\x02\x191\x02\x1A3\x02\x1B5\x02\x1C7\x02\x1D\x03\x02\t\x03\x022;\x06' +
+    '\x02\f\f\x0F\x0F$$^^\x05\x02C\\aac|\x06\x022;C\\aac|\x06\x02,,C\\aac|' +
+    '\x07\x02,,2;C\\aac|\x05\x02\v\f\x0F\x0F""\x02\xE9\x02\x03\x03\x02\x02' +
+    '\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02' +
+    '\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02' +
+    '\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02' +
+    '\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02' +
+    '\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02' +
+    "\x02#\x03\x02\x02\x02\x02%\x03\x02\x02\x02\x02'\x03\x02\x02\x02\x02)" +
+    '\x03\x02\x02\x02\x02+\x03\x02\x02\x02\x02-\x03\x02\x02\x02\x02/\x03\x02' +
+    '\x02\x02\x021\x03\x02\x02\x02\x023\x03\x02\x02\x02\x025\x03\x02\x02\x02' +
+    '\x027\x03\x02\x02\x02\x039\x03\x02\x02\x02\x05A\x03\x02\x02\x02\x07G\x03' +
+    '\x02\x02\x02\tO\x03\x02\x02\x02\vQ\x03\x02\x02\x02\rS\x03\x02\x02\x02' +
+    '\x0FV\x03\x02\x02\x02\x11Z\x03\x02\x02\x02\x13\\\x03\x02\x02\x02\x15^' +
+    '\x03\x02\x02\x02\x17`\x03\x02\x02\x02\x19b\x03\x02\x02\x02\x1Bf\x03\x02' +
+    '\x02\x02\x1Dl\x03\x02\x02\x02\x1Fr\x03\x02\x02\x02!v\x03\x02\x02\x02#' +
+    "{\x03\x02\x02\x02%\x89\x03\x02\x02\x02'\x90\x03\x02\x02\x02)\x9B\x03" +
+    '\x02\x02\x02+\xA6\x03\x02\x02\x02-\xB8\x03\x02\x02\x02/\xBE\x03\x02\x02' +
+    '\x021\xC4\x03\x02\x02\x023\xCD\x03\x02\x02\x025\xD4\x03\x02\x02\x027\xDC' +
+    '\x03\x02\x02\x029:\x07?\x02\x02:\x04\x03\x02\x02\x02;<\x07c\x02\x02<=' +
+    '\x07p\x02\x02=B\x07f\x02\x02>?\x07C\x02\x02?@\x07P\x02\x02@B\x07F\x02' +
+    '\x02A;\x03\x02\x02\x02A>\x03\x02\x02\x02B\x06\x03\x02\x02\x02CD\x07q\x02' +
+    '\x02DH\x07t\x02\x02EF\x07Q\x02\x02FH\x07T\x02\x02GC\x03\x02\x02\x02GE' +
+    '\x03\x02\x02\x02H\b\x03\x02\x02\x02IJ\x07p\x02\x02JK\x07q\x02\x02KP\x07' +
+    'v\x02\x02LM\x07P\x02\x02MN\x07Q\x02\x02NP\x07V\x02\x02OI\x03\x02\x02\x02' +
+    'OL\x03\x02\x02\x02P\n\x03\x02\x02\x02QR\x07,\x02\x02R\f\x03\x02\x02\x02' +
+    'ST\x07-\x02\x02T\x0E\x03\x02\x02\x02UW\t\x02\x02\x02VU\x03\x02\x02\x02' +
+    'WX\x03\x02\x02\x02XV\x03\x02\x02\x02XY\x03\x02\x02\x02Y\x10\x03\x02\x02' +
+    '\x02Z[\x07<\x02\x02[\x12\x03\x02\x02\x02\\]\x07*\x02\x02]\x14\x03\x02' +
+    '\x02\x02^_\x07+\x02\x02_\x16\x03\x02\x02\x02`a\x07.\x02\x02a\x18\x03\x02' +
+    '\x02\x02bc\x07m\x02\x02cd\x07g\x02\x02de\x07{\x02\x02e\x1A\x03\x02\x02' +
+    '\x02fg\x07q\x02\x02gh\x07y\x02\x02hi\x07p\x02\x02ij\x07g\x02\x02jk\x07' +
+    't\x02\x02k\x1C\x03\x02\x02\x02lm\x07i\x02\x02mn\x07t\x02\x02no\x07q\x02' +
+    '\x02op\x07w\x02\x02pq\x07r\x02\x02q\x1E\x03\x02\x02\x02rs\x07v\x02\x02' +
+    'st\x07c\x02\x02tu\x07i\x02\x02u \x03\x02\x02\x02vw\x07m\x02\x02wx\x07' +
+    'k\x02\x02xy\x07p\x02\x02yz\x07f\x02\x02z"\x03\x02\x02\x02{|\x07e\x02' +
+    '\x02|}\x07q\x02\x02}~\x07f\x02\x02~\x7F\x07g\x02\x02\x7F\x80\x07a\x02' +
+    '\x02\x80\x81\x07n\x02\x02\x81\x82\x07q\x02\x02\x82\x83\x07e\x02\x02\x83' +
+    '\x84\x07c\x02\x02\x84\x85\x07v\x02\x02\x85\x86\x07k\x02\x02\x86\x87\x07' +
+    'q\x02\x02\x87\x88\x07p\x02\x02\x88$\x03\x02\x02\x02\x89\x8A\x07e\x02\x02' +
+    '\x8A\x8B\x07q\x02\x02\x8B\x8C\x07n\x02\x02\x8C\x8D\x07w\x02\x02\x8D\x8E' +
+    '\x07o\x02\x02\x8E\x8F\x07p\x02\x02\x8F&\x03\x02\x02\x02\x90\x91\x07v\x02' +
+    '\x02\x91\x92\x07c\x02\x02\x92\x93\x07d\x02\x02\x93\x94\x07n\x02\x02\x94' +
+    '\x95\x07g\x02\x02\x95\x96\x07a\x02\x02\x96\x97\x07p\x02\x02\x97\x98\x07' +
+    'c\x02\x02\x98\x99\x07o\x02\x02\x99\x9A\x07g\x02\x02\x9A(\x03\x02\x02\x02' +
+    '\x9B\x9C\x07e\x02\x02\x9C\x9D\x07q\x02\x02\x9D\x9E\x07n\x02\x02\x9E\x9F' +
+    '\x07w\x02\x02\x9F\xA0\x07o\x02\x02\xA0\xA1\x07p\x02\x02\xA1\xA2\x07a\x02' +
+    '\x02\xA2\xA3\x07v\x02\x02\xA3\xA4\x07c\x02\x02\xA4\xA5\x07i\x02\x02\xA5' +
+    '*\x03\x02\x02\x02\xA6\xA7\x07e\x02\x02\xA7\xA8\x07j\x02\x02\xA8\xA9\x07' +
+    'c\x02\x02\xA9\xAA\x07p\x02\x02\xAA\xAB\x07i\x02\x02\xAB\xAC\x07g\x02\x02' +
+    '\xAC\xAD\x07f\x02\x02\xAD\xAE\x07a\x02\x02\xAE\xAF\x07k\x02\x02\xAF\xB0' +
+    '\x07p\x02\x02\xB0\xB1\x07a\x02\x02\xB1\xB2\x07d\x02\x02\xB2\xB3\x07t\x02' +
+    '\x02\xB3\xB4\x07c\x02\x02\xB4\xB5\x07p\x02\x02\xB5\xB6\x07e\x02\x02\xB6' +
+    '\xB7\x07j\x02\x02\xB7,\x03\x02\x02\x02\xB8\xB9\x07u\x02\x02\xB9\xBA\x07' +
+    'k\x02\x02\xBA\xBB\x07p\x02\x02\xBB\xBC\x07m\x02\x02\xBC\xBD\x07u\x02\x02' +
+    '\xBD.\x03\x02\x02\x02\xBE\xBF\x07t\x02\x02\xBF\xC0\x07q\x02\x02\xC0\xC1' +
+    '\x07q\x02\x02\xC1\xC2\x07v\x02\x02\xC2\xC3\x07u\x02\x02\xC30\x03\x02\x02' +
+    '\x02\xC4\xC8\x07$\x02\x02\xC5\xC7\n\x03\x02\x02\xC6\xC5\x03\x02\x02\x02' +
+    '\xC7\xCA\x03\x02\x02\x02\xC8\xC6\x03\x02\x02\x02\xC8\xC9\x03\x02\x02\x02' +
+    '\xC9\xCB\x03\x02\x02\x02\xCA\xC8\x03\x02\x02\x02\xCB\xCC\x07$\x02\x02' +
+    '\xCC2\x03\x02\x02\x02\xCD\xD1\t\x04\x02\x02\xCE\xD0\t\x05\x02\x02\xCF' +
+    '\xCE\x03\x02\x02\x02\xD0\xD3\x03\x02\x02\x02\xD1\xCF\x03\x02\x02\x02\xD1' +
+    '\xD2\x03\x02\x02\x02\xD24\x03\x02\x02\x02\xD3\xD1\x03\x02\x02\x02\xD4' +
+    '\xD8\t\x06\x02\x02\xD5\xD7\t\x07\x02\x02\xD6\xD5\x03\x02\x02\x02\xD7\xDA' +
+    '\x03\x02\x02\x02\xD8\xD6\x03\x02\x02\x02\xD8\xD9\x03\x02\x02\x02\xD96' +
+    '\x03\x02\x02\x02\xDA\xD8\x03\x02\x02\x02\xDB\xDD\t\b\x02\x02\xDC\xDB\x03' +
+    '\x02\x02\x02\xDD\xDE\x03\x02\x02\x02\xDE\xDC\x03\x02\x02\x02\xDE\xDF\x03' +
+    '\x02\x02\x02\xDF\xE0\x03\x02\x02\x02\xE0\xE1\b\x1C\x02\x02\xE18\x03\x02' +
+    '\x02\x02\v\x02AGOX\xC8\xD1\xD8\xDE\x03\b\x02\x02';
   public static __ATN: ATN;
   public static get _ATN(): ATN {
     if (!AssetSelectionLexer.__ATN) {
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionParser.ts b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionParser.ts
index 0d20bdc05b65f..603be9ad64d1f 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionParser.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/generated/AssetSelectionParser.ts
@@ -46,7 +46,7 @@ export class AssetSelectionParser extends Parser {
   public static readonly ROOTS = 23;
   public static readonly QUOTED_STRING = 24;
   public static readonly UNQUOTED_STRING = 25;
-  public static readonly UNQUOTED_REGEX_STRING = 26;
+  public static readonly UNQUOTED_WILDCARD_STRING = 26;
   public static readonly WS = 27;
   public static readonly RULE_start = 0;
   public static readonly RULE_expr = 1;
@@ -73,9 +73,9 @@ export class AssetSelectionParser extends Parser {
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
     "'='",
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -123,7 +123,7 @@ export class AssetSelectionParser extends Parser {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -750,7 +750,7 @@ export class AssetSelectionParser extends Parser {
             ((1 << _la) &
               ((1 << AssetSelectionParser.QUOTED_STRING) |
                 (1 << AssetSelectionParser.UNQUOTED_STRING) |
-                (1 << AssetSelectionParser.UNQUOTED_REGEX_STRING))) !==
+                (1 << AssetSelectionParser.UNQUOTED_WILDCARD_STRING))) !==
               0
           )
         ) {
@@ -1819,8 +1819,8 @@ export class KeyValueContext extends ParserRuleContext {
   public UNQUOTED_STRING(): TerminalNode | undefined {
     return this.tryGetToken(AssetSelectionParser.UNQUOTED_STRING, 0);
   }
-  public UNQUOTED_REGEX_STRING(): TerminalNode | undefined {
-    return this.tryGetToken(AssetSelectionParser.UNQUOTED_REGEX_STRING, 0);
+  public UNQUOTED_WILDCARD_STRING(): TerminalNode | undefined {
+    return this.tryGetToken(AssetSelectionParser.UNQUOTED_WILDCARD_STRING, 0);
   }
   constructor(parent: ParserRuleContext | undefined, invokingState: number) {
     super(parent, invokingState);
diff --git a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/util.ts b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/util.ts
index a8c6cc644d3de..f8ece862a02bb 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/asset-selection/util.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/asset-selection/util.ts
@@ -31,7 +31,7 @@ export function getValue(ctx: ValueContext | KeyValueContext): string {
   if (ctx.UNQUOTED_STRING()) {
     return ctx.text;
   }
-  if ('UNQUOTED_REGEX_STRING' in ctx && ctx.UNQUOTED_REGEX_STRING()) {
+  if ('UNQUOTED_WILDCARD_STRING' in ctx && ctx.UNQUOTED_WILDCARD_STRING()) {
     return ctx.text;
   }
   throw new Error('Invalid value');
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/OpSelection.g4 b/js_modules/dagster-ui/packages/ui-core/src/op-selection/OpSelection.g4
index c781d5488f930..731b27f62e31c 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/OpSelection.g4
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/OpSelection.g4
@@ -33,12 +33,12 @@ value: QUOTED_STRING | UNQUOTED_STRING;
 keyValue:
 	QUOTED_STRING
 	| UNQUOTED_STRING
-	| UNQUOTED_REGEX_STRING;
+	| UNQUOTED_WILDCARD_STRING;
 
 // Tokens for operators and keywords
-AND: 'and';
-OR: 'or';
-NOT: 'not';
+AND: 'and' | 'AND';
+OR: 'or' | 'OR';
+NOT: 'not' | 'NOT';
 
 STAR: '*';
 PLUS: '+';
@@ -60,7 +60,7 @@ ROOTS: 'roots';
 // Tokens for strings
 QUOTED_STRING: '"' (~["\\\r\n])* '"';
 UNQUOTED_STRING: [a-zA-Z_][a-zA-Z0-9_]*;
-UNQUOTED_REGEX_STRING: [a-zA-Z_*][a-zA-Z0-9_*]*;
+UNQUOTED_WILDCARD_STRING: [a-zA-Z_*][a-zA-Z0-9_*]*;
 
 // Whitespace
 WS: [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.interp b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.interp
index 58e175dc94ba0..21366982668af 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -33,7 +33,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.tokens b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.tokens
index c1283259ef80d..ee615cfc29381 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelection.tokens
@@ -12,11 +12,8 @@ SINKS=11
 ROOTS=12
 QUOTED_STRING=13
 UNQUOTED_STRING=14
-UNQUOTED_REGEX_STRING=15
+UNQUOTED_WILDCARD_STRING=15
 WS=16
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.interp b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.interp
index 0ba2763dcaacb..2dfae9aa7d286 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -33,7 +33,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
@@ -51,7 +51,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 channel names:
@@ -62,4 +62,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 18, 108, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 52, 10, 7, 13, 7, 14, 7, 53, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 7, 14, 81, 10, 14, 12, 14, 14, 14, 84, 11, 14, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 90, 10, 15, 12, 15, 14, 15, 93, 11, 15, 3, 16, 3, 16, 7, 16, 97, 10, 16, 12, 16, 14, 16, 100, 11, 16, 3, 17, 6, 17, 103, 10, 17, 13, 17, 14, 17, 104, 3, 17, 3, 17, 2, 2, 2, 18, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 112, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 3, 35, 3, 2, 2, 2, 5, 39, 3, 2, 2, 2, 7, 42, 3, 2, 2, 2, 9, 46, 3, 2, 2, 2, 11, 48, 3, 2, 2, 2, 13, 51, 3, 2, 2, 2, 15, 55, 3, 2, 2, 2, 17, 57, 3, 2, 2, 2, 19, 59, 3, 2, 2, 2, 21, 61, 3, 2, 2, 2, 23, 66, 3, 2, 2, 2, 25, 72, 3, 2, 2, 2, 27, 78, 3, 2, 2, 2, 29, 87, 3, 2, 2, 2, 31, 94, 3, 2, 2, 2, 33, 102, 3, 2, 2, 2, 35, 36, 7, 99, 2, 2, 36, 37, 7, 112, 2, 2, 37, 38, 7, 102, 2, 2, 38, 4, 3, 2, 2, 2, 39, 40, 7, 113, 2, 2, 40, 41, 7, 116, 2, 2, 41, 6, 3, 2, 2, 2, 42, 43, 7, 112, 2, 2, 43, 44, 7, 113, 2, 2, 44, 45, 7, 118, 2, 2, 45, 8, 3, 2, 2, 2, 46, 47, 7, 44, 2, 2, 47, 10, 3, 2, 2, 2, 48, 49, 7, 45, 2, 2, 49, 12, 3, 2, 2, 2, 50, 52, 9, 2, 2, 2, 51, 50, 3, 2, 2, 2, 52, 53, 3, 2, 2, 2, 53, 51, 3, 2, 2, 2, 53, 54, 3, 2, 2, 2, 54, 14, 3, 2, 2, 2, 55, 56, 7, 60, 2, 2, 56, 16, 3, 2, 2, 2, 57, 58, 7, 42, 2, 2, 58, 18, 3, 2, 2, 2, 59, 60, 7, 43, 2, 2, 60, 20, 3, 2, 2, 2, 61, 62, 7, 112, 2, 2, 62, 63, 7, 99, 2, 2, 63, 64, 7, 111, 2, 2, 64, 65, 7, 103, 2, 2, 65, 22, 3, 2, 2, 2, 66, 67, 7, 117, 2, 2, 67, 68, 7, 107, 2, 2, 68, 69, 7, 112, 2, 2, 69, 70, 7, 109, 2, 2, 70, 71, 7, 117, 2, 2, 71, 24, 3, 2, 2, 2, 72, 73, 7, 116, 2, 2, 73, 74, 7, 113, 2, 2, 74, 75, 7, 113, 2, 2, 75, 76, 7, 118, 2, 2, 76, 77, 7, 117, 2, 2, 77, 26, 3, 2, 2, 2, 78, 82, 7, 36, 2, 2, 79, 81, 10, 3, 2, 2, 80, 79, 3, 2, 2, 2, 81, 84, 3, 2, 2, 2, 82, 80, 3, 2, 2, 2, 82, 83, 3, 2, 2, 2, 83, 85, 3, 2, 2, 2, 84, 82, 3, 2, 2, 2, 85, 86, 7, 36, 2, 2, 86, 28, 3, 2, 2, 2, 87, 91, 9, 4, 2, 2, 88, 90, 9, 5, 2, 2, 89, 88, 3, 2, 2, 2, 90, 93, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 30, 3, 2, 2, 2, 93, 91, 3, 2, 2, 2, 94, 98, 9, 6, 2, 2, 95, 97, 9, 7, 2, 2, 96, 95, 3, 2, 2, 2, 97, 100, 3, 2, 2, 2, 98, 96, 3, 2, 2, 2, 98, 99, 3, 2, 2, 2, 99, 32, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 101, 103, 9, 8, 2, 2, 102, 101, 3, 2, 2, 2, 103, 104, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 104, 105, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 107, 8, 17, 2, 2, 107, 34, 3, 2, 2, 2, 8, 2, 53, 82, 91, 98, 104, 3, 8, 2, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 18, 119, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 42, 10, 2, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 48, 10, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 56, 10, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 63, 10, 7, 13, 7, 14, 7, 64, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 7, 14, 92, 10, 14, 12, 14, 14, 14, 95, 11, 14, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 101, 10, 15, 12, 15, 14, 15, 104, 11, 15, 3, 16, 3, 16, 7, 16, 108, 10, 16, 12, 16, 14, 16, 111, 11, 16, 3, 17, 6, 17, 114, 10, 17, 13, 17, 14, 17, 115, 3, 17, 3, 17, 2, 2, 2, 18, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 126, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 3, 41, 3, 2, 2, 2, 5, 47, 3, 2, 2, 2, 7, 55, 3, 2, 2, 2, 9, 57, 3, 2, 2, 2, 11, 59, 3, 2, 2, 2, 13, 62, 3, 2, 2, 2, 15, 66, 3, 2, 2, 2, 17, 68, 3, 2, 2, 2, 19, 70, 3, 2, 2, 2, 21, 72, 3, 2, 2, 2, 23, 77, 3, 2, 2, 2, 25, 83, 3, 2, 2, 2, 27, 89, 3, 2, 2, 2, 29, 98, 3, 2, 2, 2, 31, 105, 3, 2, 2, 2, 33, 113, 3, 2, 2, 2, 35, 36, 7, 99, 2, 2, 36, 37, 7, 112, 2, 2, 37, 42, 7, 102, 2, 2, 38, 39, 7, 67, 2, 2, 39, 40, 7, 80, 2, 2, 40, 42, 7, 70, 2, 2, 41, 35, 3, 2, 2, 2, 41, 38, 3, 2, 2, 2, 42, 4, 3, 2, 2, 2, 43, 44, 7, 113, 2, 2, 44, 48, 7, 116, 2, 2, 45, 46, 7, 81, 2, 2, 46, 48, 7, 84, 2, 2, 47, 43, 3, 2, 2, 2, 47, 45, 3, 2, 2, 2, 48, 6, 3, 2, 2, 2, 49, 50, 7, 112, 2, 2, 50, 51, 7, 113, 2, 2, 51, 56, 7, 118, 2, 2, 52, 53, 7, 80, 2, 2, 53, 54, 7, 81, 2, 2, 54, 56, 7, 86, 2, 2, 55, 49, 3, 2, 2, 2, 55, 52, 3, 2, 2, 2, 56, 8, 3, 2, 2, 2, 57, 58, 7, 44, 2, 2, 58, 10, 3, 2, 2, 2, 59, 60, 7, 45, 2, 2, 60, 12, 3, 2, 2, 2, 61, 63, 9, 2, 2, 2, 62, 61, 3, 2, 2, 2, 63, 64, 3, 2, 2, 2, 64, 62, 3, 2, 2, 2, 64, 65, 3, 2, 2, 2, 65, 14, 3, 2, 2, 2, 66, 67, 7, 60, 2, 2, 67, 16, 3, 2, 2, 2, 68, 69, 7, 42, 2, 2, 69, 18, 3, 2, 2, 2, 70, 71, 7, 43, 2, 2, 71, 20, 3, 2, 2, 2, 72, 73, 7, 112, 2, 2, 73, 74, 7, 99, 2, 2, 74, 75, 7, 111, 2, 2, 75, 76, 7, 103, 2, 2, 76, 22, 3, 2, 2, 2, 77, 78, 7, 117, 2, 2, 78, 79, 7, 107, 2, 2, 79, 80, 7, 112, 2, 2, 80, 81, 7, 109, 2, 2, 81, 82, 7, 117, 2, 2, 82, 24, 3, 2, 2, 2, 83, 84, 7, 116, 2, 2, 84, 85, 7, 113, 2, 2, 85, 86, 7, 113, 2, 2, 86, 87, 7, 118, 2, 2, 87, 88, 7, 117, 2, 2, 88, 26, 3, 2, 2, 2, 89, 93, 7, 36, 2, 2, 90, 92, 10, 3, 2, 2, 91, 90, 3, 2, 2, 2, 92, 95, 3, 2, 2, 2, 93, 91, 3, 2, 2, 2, 93, 94, 3, 2, 2, 2, 94, 96, 3, 2, 2, 2, 95, 93, 3, 2, 2, 2, 96, 97, 7, 36, 2, 2, 97, 28, 3, 2, 2, 2, 98, 102, 9, 4, 2, 2, 99, 101, 9, 5, 2, 2, 100, 99, 3, 2, 2, 2, 101, 104, 3, 2, 2, 2, 102, 100, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 30, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 105, 109, 9, 6, 2, 2, 106, 108, 9, 7, 2, 2, 107, 106, 3, 2, 2, 2, 108, 111, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 109, 110, 3, 2, 2, 2, 110, 32, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 112, 114, 9, 8, 2, 2, 113, 112, 3, 2, 2, 2, 114, 115, 3, 2, 2, 2, 115, 113, 3, 2, 2, 2, 115, 116, 3, 2, 2, 2, 116, 117, 3, 2, 2, 2, 117, 118, 8, 17, 2, 2, 118, 34, 3, 2, 2, 2, 11, 2, 41, 47, 55, 64, 93, 102, 109, 115, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.tokens b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.tokens
index c1283259ef80d..ee615cfc29381 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.tokens
@@ -12,11 +12,8 @@ SINKS=11
 ROOTS=12
 QUOTED_STRING=13
 UNQUOTED_STRING=14
-UNQUOTED_REGEX_STRING=15
+UNQUOTED_WILDCARD_STRING=15
 WS=16
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.ts b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.ts
index 74b63726e2cc5..a19f742480bb6 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionLexer.ts
@@ -24,7 +24,7 @@ export class OpSelectionLexer extends Lexer {
   public static readonly ROOTS = 12;
   public static readonly QUOTED_STRING = 13;
   public static readonly UNQUOTED_STRING = 14;
-  public static readonly UNQUOTED_REGEX_STRING = 15;
+  public static readonly UNQUOTED_WILDCARD_STRING = 15;
   public static readonly WS = 16;
 
   // tslint:disable:no-trailing-whitespace
@@ -48,15 +48,15 @@ export class OpSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -83,7 +83,7 @@ export class OpSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -130,52 +130,56 @@ export class OpSelectionLexer extends Lexer {
   }
 
   public static readonly _serializedATN: string =
-    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x12l\b\x01\x04' +
+    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x12w\b\x01\x04' +
     '\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04' +
     '\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r' +
     '\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x03\x02\x03\x02' +
-    '\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03\x04' +
-    '\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x06\x074\n\x07\r\x07\x0E\x07' +
-    '5\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x03\v\x03\v\x03\v\x03' +
-    '\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\r\x03\r\x03\r\x03\r\x03\r\x03\r\x03' +
-    '\x0E\x03\x0E\x07\x0EQ\n\x0E\f\x0E\x0E\x0ET\v\x0E\x03\x0E\x03\x0E\x03\x0F' +
-    '\x03\x0F\x07\x0FZ\n\x0F\f\x0F\x0E\x0F]\v\x0F\x03\x10\x03\x10\x07\x10a' +
-    '\n\x10\f\x10\x0E\x10d\v\x10\x03\x11\x06\x11g\n\x11\r\x11\x0E\x11h\x03' +
-    '\x11\x03\x11\x02\x02\x02\x12\x03\x02\x03\x05\x02\x04\x07\x02\x05\t\x02' +
-    '\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02' +
-    '\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02\x12\x03\x02\t' +
-    '\x03\x022;\x06\x02\f\f\x0F\x0F$$^^\x05\x02C\\aac|\x06\x022;C\\aac|\x06' +
-    '\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05\x02\v\f\x0F\x0F""\x02p\x02\x03' +
-    '\x03\x02\x02\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02\t' +
-    '\x03\x02\x02\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F\x03' +
-    '\x02\x02\x02\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15\x03' +
-    '\x02\x02\x02\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B\x03' +
-    '\x02\x02\x02\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!\x03' +
-    "\x02\x02\x02\x03#\x03\x02\x02\x02\x05'\x03\x02\x02\x02\x07*\x03\x02\x02" +
-    '\x02\t.\x03\x02\x02\x02\v0\x03\x02\x02\x02\r3\x03\x02\x02\x02\x0F7\x03' +
-    '\x02\x02\x02\x119\x03\x02\x02\x02\x13;\x03\x02\x02\x02\x15=\x03\x02\x02' +
-    '\x02\x17B\x03\x02\x02\x02\x19H\x03\x02\x02\x02\x1BN\x03\x02\x02\x02\x1D' +
-    'W\x03\x02\x02\x02\x1F^\x03\x02\x02\x02!f\x03\x02\x02\x02#$\x07c\x02\x02' +
-    "$%\x07p\x02\x02%&\x07f\x02\x02&\x04\x03\x02\x02\x02'(\x07q\x02\x02()" +
-    '\x07t\x02\x02)\x06\x03\x02\x02\x02*+\x07p\x02\x02+,\x07q\x02\x02,-\x07' +
-    'v\x02\x02-\b\x03\x02\x02\x02./\x07,\x02\x02/\n\x03\x02\x02\x0201\x07-' +
-    '\x02\x021\f\x03\x02\x02\x0224\t\x02\x02\x0232\x03\x02\x02\x0245\x03\x02' +
-    '\x02\x0253\x03\x02\x02\x0256\x03\x02\x02\x026\x0E\x03\x02\x02\x0278\x07' +
-    '<\x02\x028\x10\x03\x02\x02\x029:\x07*\x02\x02:\x12\x03\x02\x02\x02;<\x07' +
-    '+\x02\x02<\x14\x03\x02\x02\x02=>\x07p\x02\x02>?\x07c\x02\x02?@\x07o\x02' +
-    '\x02@A\x07g\x02\x02A\x16\x03\x02\x02\x02BC\x07u\x02\x02CD\x07k\x02\x02' +
-    'DE\x07p\x02\x02EF\x07m\x02\x02FG\x07u\x02\x02G\x18\x03\x02\x02\x02HI\x07' +
-    't\x02\x02IJ\x07q\x02\x02JK\x07q\x02\x02KL\x07v\x02\x02LM\x07u\x02\x02' +
-    'M\x1A\x03\x02\x02\x02NR\x07$\x02\x02OQ\n\x03\x02\x02PO\x03\x02\x02\x02' +
-    'QT\x03\x02\x02\x02RP\x03\x02\x02\x02RS\x03\x02\x02\x02SU\x03\x02\x02\x02' +
-    'TR\x03\x02\x02\x02UV\x07$\x02\x02V\x1C\x03\x02\x02\x02W[\t\x04\x02\x02' +
-    'XZ\t\x05\x02\x02YX\x03\x02\x02\x02Z]\x03\x02\x02\x02[Y\x03\x02\x02\x02' +
-    '[\\\x03\x02\x02\x02\\\x1E\x03\x02\x02\x02][\x03\x02\x02\x02^b\t\x06\x02' +
-    '\x02_a\t\x07\x02\x02`_\x03\x02\x02\x02ad\x03\x02\x02\x02b`\x03\x02\x02' +
-    '\x02bc\x03\x02\x02\x02c \x03\x02\x02\x02db\x03\x02\x02\x02eg\t\b\x02\x02' +
-    'fe\x03\x02\x02\x02gh\x03\x02\x02\x02hf\x03\x02\x02\x02hi\x03\x02\x02\x02' +
-    'ij\x03\x02\x02\x02jk\b\x11\x02\x02k"\x03\x02\x02\x02\b\x025R[bh\x03\b' +
-    '\x02\x02';
+    '\x03\x02\x03\x02\x03\x02\x03\x02\x05\x02*\n\x02\x03\x03\x03\x03\x03\x03' +
+    '\x03\x03\x05\x030\n\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04' +
+    '\x05\x048\n\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x06\x07?\n\x07' +
+    '\r\x07\x0E\x07@\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x03\v' +
+    '\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\r\x03\r\x03\r\x03' +
+    '\r\x03\r\x03\r\x03\x0E\x03\x0E\x07\x0E\\\n\x0E\f\x0E\x0E\x0E_\v\x0E\x03' +
+    '\x0E\x03\x0E\x03\x0F\x03\x0F\x07\x0Fe\n\x0F\f\x0F\x0E\x0Fh\v\x0F\x03\x10' +
+    '\x03\x10\x07\x10l\n\x10\f\x10\x0E\x10o\v\x10\x03\x11\x06\x11r\n\x11\r' +
+    '\x11\x0E\x11s\x03\x11\x03\x11\x02\x02\x02\x12\x03\x02\x03\x05\x02\x04' +
+    '\x07\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v' +
+    '\x15\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!' +
+    '\x02\x12\x03\x02\t\x03\x022;\x06\x02\f\f\x0F\x0F$$^^\x05\x02C\\aac|\x06' +
+    '\x022;C\\aac|\x06\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05\x02\v\f\x0F\x0F' +
+    '""\x02~\x02\x03\x03\x02\x02\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03' +
+    '\x02\x02\x02\x02\t\x03\x02\x02\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02' +
+    '\x02\x02\x02\x0F\x03\x02\x02\x02\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02' +
+    '\x02\x02\x02\x15\x03\x02\x02\x02\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02' +
+    '\x02\x02\x02\x1B\x03\x02\x02\x02\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02' +
+    '\x02\x02\x02!\x03\x02\x02\x02\x03)\x03\x02\x02\x02\x05/\x03\x02\x02\x02' +
+    '\x077\x03\x02\x02\x02\t9\x03\x02\x02\x02\v;\x03\x02\x02\x02\r>\x03\x02' +
+    '\x02\x02\x0FB\x03\x02\x02\x02\x11D\x03\x02\x02\x02\x13F\x03\x02\x02\x02' +
+    '\x15H\x03\x02\x02\x02\x17M\x03\x02\x02\x02\x19S\x03\x02\x02\x02\x1BY\x03' +
+    '\x02\x02\x02\x1Db\x03\x02\x02\x02\x1Fi\x03\x02\x02\x02!q\x03\x02\x02\x02' +
+    "#$\x07c\x02\x02$%\x07p\x02\x02%*\x07f\x02\x02&'\x07C\x02\x02'(\x07P" +
+    '\x02\x02(*\x07F\x02\x02)#\x03\x02\x02\x02)&\x03\x02\x02\x02*\x04\x03\x02' +
+    '\x02\x02+,\x07q\x02\x02,0\x07t\x02\x02-.\x07Q\x02\x02.0\x07T\x02\x02/' +
+    '+\x03\x02\x02\x02/-\x03\x02\x02\x020\x06\x03\x02\x02\x0212\x07p\x02\x02' +
+    '23\x07q\x02\x0238\x07v\x02\x0245\x07P\x02\x0256\x07Q\x02\x0268\x07V\x02' +
+    '\x0271\x03\x02\x02\x0274\x03\x02\x02\x028\b\x03\x02\x02\x029:\x07,\x02' +
+    '\x02:\n\x03\x02\x02\x02;<\x07-\x02\x02<\f\x03\x02\x02\x02=?\t\x02\x02' +
+    '\x02>=\x03\x02\x02\x02?@\x03\x02\x02\x02@>\x03\x02\x02\x02@A\x03\x02\x02' +
+    '\x02A\x0E\x03\x02\x02\x02BC\x07<\x02\x02C\x10\x03\x02\x02\x02DE\x07*\x02' +
+    '\x02E\x12\x03\x02\x02\x02FG\x07+\x02\x02G\x14\x03\x02\x02\x02HI\x07p\x02' +
+    '\x02IJ\x07c\x02\x02JK\x07o\x02\x02KL\x07g\x02\x02L\x16\x03\x02\x02\x02' +
+    'MN\x07u\x02\x02NO\x07k\x02\x02OP\x07p\x02\x02PQ\x07m\x02\x02QR\x07u\x02' +
+    '\x02R\x18\x03\x02\x02\x02ST\x07t\x02\x02TU\x07q\x02\x02UV\x07q\x02\x02' +
+    'VW\x07v\x02\x02WX\x07u\x02\x02X\x1A\x03\x02\x02\x02Y]\x07$\x02\x02Z\\' +
+    '\n\x03\x02\x02[Z\x03\x02\x02\x02\\_\x03\x02\x02\x02][\x03\x02\x02\x02' +
+    ']^\x03\x02\x02\x02^`\x03\x02\x02\x02_]\x03\x02\x02\x02`a\x07$\x02\x02' +
+    'a\x1C\x03\x02\x02\x02bf\t\x04\x02\x02ce\t\x05\x02\x02dc\x03\x02\x02\x02' +
+    'eh\x03\x02\x02\x02fd\x03\x02\x02\x02fg\x03\x02\x02\x02g\x1E\x03\x02\x02' +
+    '\x02hf\x03\x02\x02\x02im\t\x06\x02\x02jl\t\x07\x02\x02kj\x03\x02\x02\x02' +
+    'lo\x03\x02\x02\x02mk\x03\x02\x02\x02mn\x03\x02\x02\x02n \x03\x02\x02\x02' +
+    'om\x03\x02\x02\x02pr\t\b\x02\x02qp\x03\x02\x02\x02rs\x03\x02\x02\x02s' +
+    'q\x03\x02\x02\x02st\x03\x02\x02\x02tu\x03\x02\x02\x02uv\b\x11\x02\x02' +
+    'v"\x03\x02\x02\x02\v\x02)/7@]fms\x03\b\x02\x02';
   public static __ATN: ATN;
   public static get _ATN(): ATN {
     if (!OpSelectionLexer.__ATN) {
diff --git a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionParser.ts b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionParser.ts
index 942e443075e92..ea45631f88b4c 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionParser.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/op-selection/generated/OpSelectionParser.ts
@@ -35,7 +35,7 @@ export class OpSelectionParser extends Parser {
   public static readonly ROOTS = 12;
   public static readonly QUOTED_STRING = 13;
   public static readonly UNQUOTED_STRING = 14;
-  public static readonly UNQUOTED_REGEX_STRING = 15;
+  public static readonly UNQUOTED_WILDCARD_STRING = 15;
   public static readonly WS = 16;
   public static readonly RULE_start = 0;
   public static readonly RULE_expr = 1;
@@ -61,9 +61,9 @@ export class OpSelectionParser extends Parser {
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -90,7 +90,7 @@ export class OpSelectionParser extends Parser {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -565,7 +565,7 @@ export class OpSelectionParser extends Parser {
             ((1 << _la) &
               ((1 << OpSelectionParser.QUOTED_STRING) |
                 (1 << OpSelectionParser.UNQUOTED_STRING) |
-                (1 << OpSelectionParser.UNQUOTED_REGEX_STRING))) !==
+                (1 << OpSelectionParser.UNQUOTED_WILDCARD_STRING))) !==
               0
           )
         ) {
@@ -1286,8 +1286,8 @@ export class KeyValueContext extends ParserRuleContext {
   public UNQUOTED_STRING(): TerminalNode | undefined {
     return this.tryGetToken(OpSelectionParser.UNQUOTED_STRING, 0);
   }
-  public UNQUOTED_REGEX_STRING(): TerminalNode | undefined {
-    return this.tryGetToken(OpSelectionParser.UNQUOTED_REGEX_STRING, 0);
+  public UNQUOTED_WILDCARD_STRING(): TerminalNode | undefined {
+    return this.tryGetToken(OpSelectionParser.UNQUOTED_WILDCARD_STRING, 0);
   }
   constructor(parent: ParserRuleContext | undefined, invokingState: number) {
     super(parent, invokingState);
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/RunSelection.g4 b/js_modules/dagster-ui/packages/ui-core/src/run-selection/RunSelection.g4
index 764ede35b9f49..b57d67655b73b 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/RunSelection.g4
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/RunSelection.g4
@@ -35,12 +35,12 @@ value: QUOTED_STRING | UNQUOTED_STRING;
 keyValue:
 	QUOTED_STRING
 	| UNQUOTED_STRING
-	| UNQUOTED_REGEX_STRING;
+	| UNQUOTED_WILDCARD_STRING;
 
 // Tokens for operators and keywords
-AND: 'and';
-OR: 'or';
-NOT: 'not';
+AND: 'and' | 'AND';
+OR: 'or' | 'OR';
+NOT: 'not' | 'NOT';
 
 STAR: '*';
 PLUS: '+';
@@ -63,7 +63,7 @@ ROOTS: 'roots';
 // Tokens for strings
 QUOTED_STRING: '"' (~["\\\r\n])* '"';
 UNQUOTED_STRING: [a-zA-Z_][a-zA-Z0-9_]*;
-UNQUOTED_REGEX_STRING: [a-zA-Z_*][a-zA-Z0-9_*]*;
+UNQUOTED_WILDCARD_STRING: [a-zA-Z_*][a-zA-Z0-9_*]*;
 
 // Whitespace
 WS: [ \t\r\n]+ -> skip;
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.interp b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.interp
index 9bac73a1e64a4..306dca915116d 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -35,7 +35,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.tokens b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.tokens
index 9bbde34597dcb..78509a498b055 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelection.tokens
@@ -13,11 +13,8 @@ SINKS=12
 ROOTS=13
 QUOTED_STRING=14
 UNQUOTED_STRING=15
-UNQUOTED_REGEX_STRING=16
+UNQUOTED_WILDCARD_STRING=16
 WS=17
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.interp b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.interp
index 82ce12d0928ff..415181f97fe3c 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -35,7 +35,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 rule names:
@@ -54,7 +54,7 @@ SINKS
 ROOTS
 QUOTED_STRING
 UNQUOTED_STRING
-UNQUOTED_REGEX_STRING
+UNQUOTED_WILDCARD_STRING
 WS
 
 channel names:
@@ -65,4 +65,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 19, 117, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 54, 10, 7, 13, 7, 14, 7, 55, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 90, 10, 15, 12, 15, 14, 15, 93, 11, 15, 3, 15, 3, 15, 3, 16, 3, 16, 7, 16, 99, 10, 16, 12, 16, 14, 16, 102, 11, 16, 3, 17, 3, 17, 7, 17, 106, 10, 17, 12, 17, 14, 17, 109, 11, 17, 3, 18, 6, 18, 112, 10, 18, 13, 18, 14, 18, 113, 3, 18, 3, 18, 2, 2, 2, 19, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 121, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 3, 37, 3, 2, 2, 2, 5, 41, 3, 2, 2, 2, 7, 44, 3, 2, 2, 2, 9, 48, 3, 2, 2, 2, 11, 50, 3, 2, 2, 2, 13, 53, 3, 2, 2, 2, 15, 57, 3, 2, 2, 2, 17, 59, 3, 2, 2, 2, 19, 61, 3, 2, 2, 2, 21, 63, 3, 2, 2, 2, 23, 68, 3, 2, 2, 2, 25, 75, 3, 2, 2, 2, 27, 81, 3, 2, 2, 2, 29, 87, 3, 2, 2, 2, 31, 96, 3, 2, 2, 2, 33, 103, 3, 2, 2, 2, 35, 111, 3, 2, 2, 2, 37, 38, 7, 99, 2, 2, 38, 39, 7, 112, 2, 2, 39, 40, 7, 102, 2, 2, 40, 4, 3, 2, 2, 2, 41, 42, 7, 113, 2, 2, 42, 43, 7, 116, 2, 2, 43, 6, 3, 2, 2, 2, 44, 45, 7, 112, 2, 2, 45, 46, 7, 113, 2, 2, 46, 47, 7, 118, 2, 2, 47, 8, 3, 2, 2, 2, 48, 49, 7, 44, 2, 2, 49, 10, 3, 2, 2, 2, 50, 51, 7, 45, 2, 2, 51, 12, 3, 2, 2, 2, 52, 54, 9, 2, 2, 2, 53, 52, 3, 2, 2, 2, 54, 55, 3, 2, 2, 2, 55, 53, 3, 2, 2, 2, 55, 56, 3, 2, 2, 2, 56, 14, 3, 2, 2, 2, 57, 58, 7, 60, 2, 2, 58, 16, 3, 2, 2, 2, 59, 60, 7, 42, 2, 2, 60, 18, 3, 2, 2, 2, 61, 62, 7, 43, 2, 2, 62, 20, 3, 2, 2, 2, 63, 64, 7, 112, 2, 2, 64, 65, 7, 99, 2, 2, 65, 66, 7, 111, 2, 2, 66, 67, 7, 103, 2, 2, 67, 22, 3, 2, 2, 2, 68, 69, 7, 117, 2, 2, 69, 70, 7, 118, 2, 2, 70, 71, 7, 99, 2, 2, 71, 72, 7, 118, 2, 2, 72, 73, 7, 119, 2, 2, 73, 74, 7, 117, 2, 2, 74, 24, 3, 2, 2, 2, 75, 76, 7, 117, 2, 2, 76, 77, 7, 107, 2, 2, 77, 78, 7, 112, 2, 2, 78, 79, 7, 109, 2, 2, 79, 80, 7, 117, 2, 2, 80, 26, 3, 2, 2, 2, 81, 82, 7, 116, 2, 2, 82, 83, 7, 113, 2, 2, 83, 84, 7, 113, 2, 2, 84, 85, 7, 118, 2, 2, 85, 86, 7, 117, 2, 2, 86, 28, 3, 2, 2, 2, 87, 91, 7, 36, 2, 2, 88, 90, 10, 3, 2, 2, 89, 88, 3, 2, 2, 2, 90, 93, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 94, 3, 2, 2, 2, 93, 91, 3, 2, 2, 2, 94, 95, 7, 36, 2, 2, 95, 30, 3, 2, 2, 2, 96, 100, 9, 4, 2, 2, 97, 99, 9, 5, 2, 2, 98, 97, 3, 2, 2, 2, 99, 102, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 32, 3, 2, 2, 2, 102, 100, 3, 2, 2, 2, 103, 107, 9, 6, 2, 2, 104, 106, 9, 7, 2, 2, 105, 104, 3, 2, 2, 2, 106, 109, 3, 2, 2, 2, 107, 105, 3, 2, 2, 2, 107, 108, 3, 2, 2, 2, 108, 34, 3, 2, 2, 2, 109, 107, 3, 2, 2, 2, 110, 112, 9, 8, 2, 2, 111, 110, 3, 2, 2, 2, 112, 113, 3, 2, 2, 2, 113, 111, 3, 2, 2, 2, 113, 114, 3, 2, 2, 2, 114, 115, 3, 2, 2, 2, 115, 116, 8, 18, 2, 2, 116, 36, 3, 2, 2, 2, 8, 2, 55, 91, 100, 107, 113, 3, 8, 2, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 19, 128, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 44, 10, 2, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 50, 10, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 58, 10, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 65, 10, 7, 13, 7, 14, 7, 66, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 101, 10, 15, 12, 15, 14, 15, 104, 11, 15, 3, 15, 3, 15, 3, 16, 3, 16, 7, 16, 110, 10, 16, 12, 16, 14, 16, 113, 11, 16, 3, 17, 3, 17, 7, 17, 117, 10, 17, 12, 17, 14, 17, 120, 11, 17, 3, 18, 6, 18, 123, 10, 18, 13, 18, 14, 18, 124, 3, 18, 3, 18, 2, 2, 2, 19, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 33, 2, 18, 35, 2, 19, 3, 2, 9, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 5, 2, 67, 92, 97, 97, 99, 124, 6, 2, 50, 59, 67, 92, 97, 97, 99, 124, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 135, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 2, 33, 3, 2, 2, 2, 2, 35, 3, 2, 2, 2, 3, 43, 3, 2, 2, 2, 5, 49, 3, 2, 2, 2, 7, 57, 3, 2, 2, 2, 9, 59, 3, 2, 2, 2, 11, 61, 3, 2, 2, 2, 13, 64, 3, 2, 2, 2, 15, 68, 3, 2, 2, 2, 17, 70, 3, 2, 2, 2, 19, 72, 3, 2, 2, 2, 21, 74, 3, 2, 2, 2, 23, 79, 3, 2, 2, 2, 25, 86, 3, 2, 2, 2, 27, 92, 3, 2, 2, 2, 29, 98, 3, 2, 2, 2, 31, 107, 3, 2, 2, 2, 33, 114, 3, 2, 2, 2, 35, 122, 3, 2, 2, 2, 37, 38, 7, 99, 2, 2, 38, 39, 7, 112, 2, 2, 39, 44, 7, 102, 2, 2, 40, 41, 7, 67, 2, 2, 41, 42, 7, 80, 2, 2, 42, 44, 7, 70, 2, 2, 43, 37, 3, 2, 2, 2, 43, 40, 3, 2, 2, 2, 44, 4, 3, 2, 2, 2, 45, 46, 7, 113, 2, 2, 46, 50, 7, 116, 2, 2, 47, 48, 7, 81, 2, 2, 48, 50, 7, 84, 2, 2, 49, 45, 3, 2, 2, 2, 49, 47, 3, 2, 2, 2, 50, 6, 3, 2, 2, 2, 51, 52, 7, 112, 2, 2, 52, 53, 7, 113, 2, 2, 53, 58, 7, 118, 2, 2, 54, 55, 7, 80, 2, 2, 55, 56, 7, 81, 2, 2, 56, 58, 7, 86, 2, 2, 57, 51, 3, 2, 2, 2, 57, 54, 3, 2, 2, 2, 58, 8, 3, 2, 2, 2, 59, 60, 7, 44, 2, 2, 60, 10, 3, 2, 2, 2, 61, 62, 7, 45, 2, 2, 62, 12, 3, 2, 2, 2, 63, 65, 9, 2, 2, 2, 64, 63, 3, 2, 2, 2, 65, 66, 3, 2, 2, 2, 66, 64, 3, 2, 2, 2, 66, 67, 3, 2, 2, 2, 67, 14, 3, 2, 2, 2, 68, 69, 7, 60, 2, 2, 69, 16, 3, 2, 2, 2, 70, 71, 7, 42, 2, 2, 71, 18, 3, 2, 2, 2, 72, 73, 7, 43, 2, 2, 73, 20, 3, 2, 2, 2, 74, 75, 7, 112, 2, 2, 75, 76, 7, 99, 2, 2, 76, 77, 7, 111, 2, 2, 77, 78, 7, 103, 2, 2, 78, 22, 3, 2, 2, 2, 79, 80, 7, 117, 2, 2, 80, 81, 7, 118, 2, 2, 81, 82, 7, 99, 2, 2, 82, 83, 7, 118, 2, 2, 83, 84, 7, 119, 2, 2, 84, 85, 7, 117, 2, 2, 85, 24, 3, 2, 2, 2, 86, 87, 7, 117, 2, 2, 87, 88, 7, 107, 2, 2, 88, 89, 7, 112, 2, 2, 89, 90, 7, 109, 2, 2, 90, 91, 7, 117, 2, 2, 91, 26, 3, 2, 2, 2, 92, 93, 7, 116, 2, 2, 93, 94, 7, 113, 2, 2, 94, 95, 7, 113, 2, 2, 95, 96, 7, 118, 2, 2, 96, 97, 7, 117, 2, 2, 97, 28, 3, 2, 2, 2, 98, 102, 7, 36, 2, 2, 99, 101, 10, 3, 2, 2, 100, 99, 3, 2, 2, 2, 101, 104, 3, 2, 2, 2, 102, 100, 3, 2, 2, 2, 102, 103, 3, 2, 2, 2, 103, 105, 3, 2, 2, 2, 104, 102, 3, 2, 2, 2, 105, 106, 7, 36, 2, 2, 106, 30, 3, 2, 2, 2, 107, 111, 9, 4, 2, 2, 108, 110, 9, 5, 2, 2, 109, 108, 3, 2, 2, 2, 110, 113, 3, 2, 2, 2, 111, 109, 3, 2, 2, 2, 111, 112, 3, 2, 2, 2, 112, 32, 3, 2, 2, 2, 113, 111, 3, 2, 2, 2, 114, 118, 9, 6, 2, 2, 115, 117, 9, 7, 2, 2, 116, 115, 3, 2, 2, 2, 117, 120, 3, 2, 2, 2, 118, 116, 3, 2, 2, 2, 118, 119, 3, 2, 2, 2, 119, 34, 3, 2, 2, 2, 120, 118, 3, 2, 2, 2, 121, 123, 9, 8, 2, 2, 122, 121, 3, 2, 2, 2, 123, 124, 3, 2, 2, 2, 124, 122, 3, 2, 2, 2, 124, 125, 3, 2, 2, 2, 125, 126, 3, 2, 2, 2, 126, 127, 8, 18, 2, 2, 127, 36, 3, 2, 2, 2, 11, 2, 43, 49, 57, 66, 102, 111, 118, 124, 3, 8, 2, 2]
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.tokens b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.tokens
index 9bbde34597dcb..78509a498b055 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.tokens
@@ -13,11 +13,8 @@ SINKS=12
 ROOTS=13
 QUOTED_STRING=14
 UNQUOTED_STRING=15
-UNQUOTED_REGEX_STRING=16
+UNQUOTED_WILDCARD_STRING=16
 WS=17
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.ts b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.ts
index 88cd1ede986b1..8f6b3f19de5ee 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionLexer.ts
@@ -25,7 +25,7 @@ export class RunSelectionLexer extends Lexer {
   public static readonly ROOTS = 13;
   public static readonly QUOTED_STRING = 14;
   public static readonly UNQUOTED_STRING = 15;
-  public static readonly UNQUOTED_REGEX_STRING = 16;
+  public static readonly UNQUOTED_WILDCARD_STRING = 16;
   public static readonly WS = 17;
 
   // tslint:disable:no-trailing-whitespace
@@ -50,15 +50,15 @@ export class RunSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -87,7 +87,7 @@ export class RunSelectionLexer extends Lexer {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -134,55 +134,59 @@ export class RunSelectionLexer extends Lexer {
   }
 
   public static readonly _serializedATN: string =
-    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x13u\b\x01\x04' +
-    '\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04' +
-    '\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r' +
-    '\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12' +
-    '\x03\x02\x03\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04' +
-    '\x03\x04\x03\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x06\x076\n\x07' +
-    '\r\x07\x0E\x077\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x03\v' +
-    '\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\r\x03\r\x03' +
-    '\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x03' +
-    '\x0F\x03\x0F\x07\x0FZ\n\x0F\f\x0F\x0E\x0F]\v\x0F\x03\x0F\x03\x0F\x03\x10' +
-    '\x03\x10\x07\x10c\n\x10\f\x10\x0E\x10f\v\x10\x03\x11\x03\x11\x07\x11j' +
-    '\n\x11\f\x11\x0E\x11m\v\x11\x03\x12\x06\x12p\n\x12\r\x12\x0E\x12q\x03' +
-    '\x12\x03\x12\x02\x02\x02\x13\x03\x02\x03\x05\x02\x04\x07\x02\x05\t\x02' +
-    '\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02' +
-    '\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!\x02\x12#\x02\x13\x03' +
-    '\x02\t\x03\x022;\x06\x02\f\f\x0F\x0F$$^^\x05\x02C\\aac|\x06\x022;C\\a' +
-    'ac|\x06\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05\x02\v\f\x0F\x0F""\x02y\x02' +
-    '\x03\x03\x02\x02\x02\x02\x05\x03\x02\x02\x02\x02\x07\x03\x02\x02\x02\x02' +
-    '\t\x03\x02\x02\x02\x02\v\x03\x02\x02\x02\x02\r\x03\x02\x02\x02\x02\x0F' +
-    '\x03\x02\x02\x02\x02\x11\x03\x02\x02\x02\x02\x13\x03\x02\x02\x02\x02\x15' +
-    '\x03\x02\x02\x02\x02\x17\x03\x02\x02\x02\x02\x19\x03\x02\x02\x02\x02\x1B' +
-    '\x03\x02\x02\x02\x02\x1D\x03\x02\x02\x02\x02\x1F\x03\x02\x02\x02\x02!' +
-    '\x03\x02\x02\x02\x02#\x03\x02\x02\x02\x03%\x03\x02\x02\x02\x05)\x03\x02' +
-    '\x02\x02\x07,\x03\x02\x02\x02\t0\x03\x02\x02\x02\v2\x03\x02\x02\x02\r' +
-    '5\x03\x02\x02\x02\x0F9\x03\x02\x02\x02\x11;\x03\x02\x02\x02\x13=\x03\x02' +
-    '\x02\x02\x15?\x03\x02\x02\x02\x17D\x03\x02\x02\x02\x19K\x03\x02\x02\x02' +
-    '\x1BQ\x03\x02\x02\x02\x1DW\x03\x02\x02\x02\x1F`\x03\x02\x02\x02!g\x03' +
-    "\x02\x02\x02#o\x03\x02\x02\x02%&\x07c\x02\x02&'\x07p\x02\x02'(\x07f" +
-    '\x02\x02(\x04\x03\x02\x02\x02)*\x07q\x02\x02*+\x07t\x02\x02+\x06\x03\x02' +
-    '\x02\x02,-\x07p\x02\x02-.\x07q\x02\x02./\x07v\x02\x02/\b\x03\x02\x02\x02' +
-    '01\x07,\x02\x021\n\x03\x02\x02\x0223\x07-\x02\x023\f\x03\x02\x02\x024' +
-    '6\t\x02\x02\x0254\x03\x02\x02\x0267\x03\x02\x02\x0275\x03\x02\x02\x02' +
-    '78\x03\x02\x02\x028\x0E\x03\x02\x02\x029:\x07<\x02\x02:\x10\x03\x02\x02' +
-    '\x02;<\x07*\x02\x02<\x12\x03\x02\x02\x02=>\x07+\x02\x02>\x14\x03\x02\x02' +
-    '\x02?@\x07p\x02\x02@A\x07c\x02\x02AB\x07o\x02\x02BC\x07g\x02\x02C\x16' +
-    '\x03\x02\x02\x02DE\x07u\x02\x02EF\x07v\x02\x02FG\x07c\x02\x02GH\x07v\x02' +
-    '\x02HI\x07w\x02\x02IJ\x07u\x02\x02J\x18\x03\x02\x02\x02KL\x07u\x02\x02' +
-    'LM\x07k\x02\x02MN\x07p\x02\x02NO\x07m\x02\x02OP\x07u\x02\x02P\x1A\x03' +
-    '\x02\x02\x02QR\x07t\x02\x02RS\x07q\x02\x02ST\x07q\x02\x02TU\x07v\x02\x02' +
-    'UV\x07u\x02\x02V\x1C\x03\x02\x02\x02W[\x07$\x02\x02XZ\n\x03\x02\x02YX' +
-    '\x03\x02\x02\x02Z]\x03\x02\x02\x02[Y\x03\x02\x02\x02[\\\x03\x02\x02\x02' +
-    '\\^\x03\x02\x02\x02][\x03\x02\x02\x02^_\x07$\x02\x02_\x1E\x03\x02\x02' +
-    '\x02`d\t\x04\x02\x02ac\t\x05\x02\x02ba\x03\x02\x02\x02cf\x03\x02\x02\x02' +
-    'db\x03\x02\x02\x02de\x03\x02\x02\x02e \x03\x02\x02\x02fd\x03\x02\x02\x02' +
-    'gk\t\x06\x02\x02hj\t\x07\x02\x02ih\x03\x02\x02\x02jm\x03\x02\x02\x02k' +
-    'i\x03\x02\x02\x02kl\x03\x02\x02\x02l"\x03\x02\x02\x02mk\x03\x02\x02\x02' +
-    'np\t\b\x02\x02on\x03\x02\x02\x02pq\x03\x02\x02\x02qo\x03\x02\x02\x02q' +
-    'r\x03\x02\x02\x02rs\x03\x02\x02\x02st\b\x12\x02\x02t$\x03\x02\x02\x02' +
-    '\b\x027[dkq\x03\b\x02\x02';
+    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x13\x80\b\x01' +
+    '\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06' +
+    '\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r' +
+    '\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t' +
+    '\x12\x03\x02\x03\x02\x03\x02\x03\x02\x03\x02\x03\x02\x05\x02,\n\x02\x03' +
+    '\x03\x03\x03\x03\x03\x03\x03\x05\x032\n\x03\x03\x04\x03\x04\x03\x04\x03' +
+    '\x04\x03\x04\x03\x04\x05\x04:\n\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03' +
+    '\x07\x06\x07A\n\x07\r\x07\x0E\x07B\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n' +
+    '\x03\v\x03\v\x03\v\x03\v\x03\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03' +
+    '\f\x03\r\x03\r\x03\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0E\x03\x0E' +
+    '\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x07\x0Fe\n\x0F\f\x0F\x0E\x0Fh\v\x0F\x03' +
+    '\x0F\x03\x0F\x03\x10\x03\x10\x07\x10n\n\x10\f\x10\x0E\x10q\v\x10\x03\x11' +
+    '\x03\x11\x07\x11u\n\x11\f\x11\x0E\x11x\v\x11\x03\x12\x06\x12{\n\x12\r' +
+    '\x12\x0E\x12|\x03\x12\x03\x12\x02\x02\x02\x13\x03\x02\x03\x05\x02\x04' +
+    '\x07\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v' +
+    '\x15\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02\x10\x1F\x02\x11!' +
+    '\x02\x12#\x02\x13\x03\x02\t\x03\x022;\x06\x02\f\f\x0F\x0F$$^^\x05\x02' +
+    'C\\aac|\x06\x022;C\\aac|\x06\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05\x02\v' +
+    '\f\x0F\x0F""\x02\x87\x02\x03\x03\x02\x02\x02\x02\x05\x03\x02\x02\x02' +
+    '\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02\x02\x02\v\x03\x02\x02\x02\x02' +
+    '\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02\x11\x03\x02\x02\x02\x02' +
+    '\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02\x17\x03\x02\x02\x02\x02' +
+    '\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02\x1D\x03\x02\x02\x02\x02' +
+    '\x1F\x03\x02\x02\x02\x02!\x03\x02\x02\x02\x02#\x03\x02\x02\x02\x03+\x03' +
+    '\x02\x02\x02\x051\x03\x02\x02\x02\x079\x03\x02\x02\x02\t;\x03\x02\x02' +
+    '\x02\v=\x03\x02\x02\x02\r@\x03\x02\x02\x02\x0FD\x03\x02\x02\x02\x11F\x03' +
+    '\x02\x02\x02\x13H\x03\x02\x02\x02\x15J\x03\x02\x02\x02\x17O\x03\x02\x02' +
+    '\x02\x19V\x03\x02\x02\x02\x1B\\\x03\x02\x02\x02\x1Db\x03\x02\x02\x02\x1F' +
+    'k\x03\x02\x02\x02!r\x03\x02\x02\x02#z\x03\x02\x02\x02%&\x07c\x02\x02&' +
+    "'\x07p\x02\x02',\x07f\x02\x02()\x07C\x02\x02)*\x07P\x02\x02*,\x07F\x02" +
+    '\x02+%\x03\x02\x02\x02+(\x03\x02\x02\x02,\x04\x03\x02\x02\x02-.\x07q\x02' +
+    '\x02.2\x07t\x02\x02/0\x07Q\x02\x0202\x07T\x02\x021-\x03\x02\x02\x021/' +
+    '\x03\x02\x02\x022\x06\x03\x02\x02\x0234\x07p\x02\x0245\x07q\x02\x025:' +
+    '\x07v\x02\x0267\x07P\x02\x0278\x07Q\x02\x028:\x07V\x02\x0293\x03\x02\x02' +
+    '\x0296\x03\x02\x02\x02:\b\x03\x02\x02\x02;<\x07,\x02\x02<\n\x03\x02\x02' +
+    '\x02=>\x07-\x02\x02>\f\x03\x02\x02\x02?A\t\x02\x02\x02@?\x03\x02\x02\x02' +
+    'AB\x03\x02\x02\x02B@\x03\x02\x02\x02BC\x03\x02\x02\x02C\x0E\x03\x02\x02' +
+    '\x02DE\x07<\x02\x02E\x10\x03\x02\x02\x02FG\x07*\x02\x02G\x12\x03\x02\x02' +
+    '\x02HI\x07+\x02\x02I\x14\x03\x02\x02\x02JK\x07p\x02\x02KL\x07c\x02\x02' +
+    'LM\x07o\x02\x02MN\x07g\x02\x02N\x16\x03\x02\x02\x02OP\x07u\x02\x02PQ\x07' +
+    'v\x02\x02QR\x07c\x02\x02RS\x07v\x02\x02ST\x07w\x02\x02TU\x07u\x02\x02' +
+    'U\x18\x03\x02\x02\x02VW\x07u\x02\x02WX\x07k\x02\x02XY\x07p\x02\x02YZ\x07' +
+    'm\x02\x02Z[\x07u\x02\x02[\x1A\x03\x02\x02\x02\\]\x07t\x02\x02]^\x07q\x02' +
+    '\x02^_\x07q\x02\x02_`\x07v\x02\x02`a\x07u\x02\x02a\x1C\x03\x02\x02\x02' +
+    'bf\x07$\x02\x02ce\n\x03\x02\x02dc\x03\x02\x02\x02eh\x03\x02\x02\x02fd' +
+    '\x03\x02\x02\x02fg\x03\x02\x02\x02gi\x03\x02\x02\x02hf\x03\x02\x02\x02' +
+    'ij\x07$\x02\x02j\x1E\x03\x02\x02\x02ko\t\x04\x02\x02ln\t\x05\x02\x02m' +
+    'l\x03\x02\x02\x02nq\x03\x02\x02\x02om\x03\x02\x02\x02op\x03\x02\x02\x02' +
+    'p \x03\x02\x02\x02qo\x03\x02\x02\x02rv\t\x06\x02\x02su\t\x07\x02\x02t' +
+    's\x03\x02\x02\x02ux\x03\x02\x02\x02vt\x03\x02\x02\x02vw\x03\x02\x02\x02' +
+    'w"\x03\x02\x02\x02xv\x03\x02\x02\x02y{\t\b\x02\x02zy\x03\x02\x02\x02' +
+    '{|\x03\x02\x02\x02|z\x03\x02\x02\x02|}\x03\x02\x02\x02}~\x03\x02\x02\x02' +
+    '~\x7F\b\x12\x02\x02\x7F$\x03\x02\x02\x02\v\x02+19Bfov|\x03\b\x02\x02';
   public static __ATN: ATN;
   public static get _ATN(): ATN {
     if (!RunSelectionLexer.__ATN) {
diff --git a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionParser.ts b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionParser.ts
index 58bceebd52429..13447504be57f 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionParser.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/run-selection/generated/RunSelectionParser.ts
@@ -36,7 +36,7 @@ export class RunSelectionParser extends Parser {
   public static readonly ROOTS = 13;
   public static readonly QUOTED_STRING = 14;
   public static readonly UNQUOTED_STRING = 15;
-  public static readonly UNQUOTED_REGEX_STRING = 16;
+  public static readonly UNQUOTED_WILDCARD_STRING = 16;
   public static readonly WS = 17;
   public static readonly RULE_start = 0;
   public static readonly RULE_expr = 1;
@@ -62,9 +62,9 @@ export class RunSelectionParser extends Parser {
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -93,7 +93,7 @@ export class RunSelectionParser extends Parser {
     'ROOTS',
     'QUOTED_STRING',
     'UNQUOTED_STRING',
-    'UNQUOTED_REGEX_STRING',
+    'UNQUOTED_WILDCARD_STRING',
     'WS',
   ];
   public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
@@ -589,7 +589,7 @@ export class RunSelectionParser extends Parser {
             ((1 << _la) &
               ((1 << RunSelectionParser.QUOTED_STRING) |
                 (1 << RunSelectionParser.UNQUOTED_STRING) |
-                (1 << RunSelectionParser.UNQUOTED_REGEX_STRING))) !==
+                (1 << RunSelectionParser.UNQUOTED_WILDCARD_STRING))) !==
               0
           )
         ) {
@@ -1346,8 +1346,8 @@ export class KeyValueContext extends ParserRuleContext {
   public UNQUOTED_STRING(): TerminalNode | undefined {
     return this.tryGetToken(RunSelectionParser.UNQUOTED_STRING, 0);
   }
-  public UNQUOTED_REGEX_STRING(): TerminalNode | undefined {
-    return this.tryGetToken(RunSelectionParser.UNQUOTED_REGEX_STRING, 0);
+  public UNQUOTED_WILDCARD_STRING(): TerminalNode | undefined {
+    return this.tryGetToken(RunSelectionParser.UNQUOTED_WILDCARD_STRING, 0);
   }
   constructor(parent: ParserRuleContext | undefined, invokingState: number) {
     super(parent, invokingState);
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.g4 b/js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.g4
index 6e517031dfca6..cf09def54f42d 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.g4
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/SelectionAutoComplete.g4
@@ -109,9 +109,9 @@ value:
 	| IDENTIFIER						# UnquotedStringValue;
 
 // Tokens for operators and keywords
-AND: 'and';
-OR: 'or';
-NOT: 'not';
+AND: 'and' | 'AND';
+OR: 'or' | 'OR';
+NOT: 'not' | 'NOT';
 
 STAR: '*';
 PLUS: '+';
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.interp b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.interp
index dd148d30935da..24cd2a30b80a3 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.tokens b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.tokens
index 1e36f3f8cb6db..79e1f9ad84007 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoComplete.tokens
@@ -13,9 +13,6 @@ INCOMPLETE_RIGHT_QUOTED_STRING=12
 EQUAL=13
 IDENTIFIER=14
 WS=15
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.interp b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.interp
index 7f527c917543a..f2c5340c38f05 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.interp
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.interp
@@ -1,8 +1,8 @@
 token literal names:
 null
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -59,4 +59,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 17, 97, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 50, 10, 7, 13, 7, 14, 7, 51, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 7, 11, 62, 10, 11, 12, 11, 14, 11, 65, 11, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 71, 10, 12, 12, 12, 14, 12, 74, 11, 12, 3, 13, 7, 13, 77, 10, 13, 12, 13, 14, 13, 80, 11, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 88, 10, 15, 12, 15, 14, 15, 91, 11, 15, 3, 16, 6, 16, 94, 10, 16, 13, 16, 14, 16, 95, 2, 2, 2, 17, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 3, 2, 8, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 9, 2, 12, 12, 15, 15, 36, 36, 42, 43, 60, 60, 63, 63, 94, 94, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 102, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 3, 33, 3, 2, 2, 2, 5, 37, 3, 2, 2, 2, 7, 40, 3, 2, 2, 2, 9, 44, 3, 2, 2, 2, 11, 46, 3, 2, 2, 2, 13, 49, 3, 2, 2, 2, 15, 53, 3, 2, 2, 2, 17, 55, 3, 2, 2, 2, 19, 57, 3, 2, 2, 2, 21, 59, 3, 2, 2, 2, 23, 68, 3, 2, 2, 2, 25, 78, 3, 2, 2, 2, 27, 83, 3, 2, 2, 2, 29, 85, 3, 2, 2, 2, 31, 93, 3, 2, 2, 2, 33, 34, 7, 99, 2, 2, 34, 35, 7, 112, 2, 2, 35, 36, 7, 102, 2, 2, 36, 4, 3, 2, 2, 2, 37, 38, 7, 113, 2, 2, 38, 39, 7, 116, 2, 2, 39, 6, 3, 2, 2, 2, 40, 41, 7, 112, 2, 2, 41, 42, 7, 113, 2, 2, 42, 43, 7, 118, 2, 2, 43, 8, 3, 2, 2, 2, 44, 45, 7, 44, 2, 2, 45, 10, 3, 2, 2, 2, 46, 47, 7, 45, 2, 2, 47, 12, 3, 2, 2, 2, 48, 50, 9, 2, 2, 2, 49, 48, 3, 2, 2, 2, 50, 51, 3, 2, 2, 2, 51, 49, 3, 2, 2, 2, 51, 52, 3, 2, 2, 2, 52, 14, 3, 2, 2, 2, 53, 54, 7, 60, 2, 2, 54, 16, 3, 2, 2, 2, 55, 56, 7, 42, 2, 2, 56, 18, 3, 2, 2, 2, 57, 58, 7, 43, 2, 2, 58, 20, 3, 2, 2, 2, 59, 63, 7, 36, 2, 2, 60, 62, 10, 3, 2, 2, 61, 60, 3, 2, 2, 2, 62, 65, 3, 2, 2, 2, 63, 61, 3, 2, 2, 2, 63, 64, 3, 2, 2, 2, 64, 66, 3, 2, 2, 2, 65, 63, 3, 2, 2, 2, 66, 67, 7, 36, 2, 2, 67, 22, 3, 2, 2, 2, 68, 72, 7, 36, 2, 2, 69, 71, 10, 4, 2, 2, 70, 69, 3, 2, 2, 2, 71, 74, 3, 2, 2, 2, 72, 70, 3, 2, 2, 2, 72, 73, 3, 2, 2, 2, 73, 24, 3, 2, 2, 2, 74, 72, 3, 2, 2, 2, 75, 77, 10, 4, 2, 2, 76, 75, 3, 2, 2, 2, 77, 80, 3, 2, 2, 2, 78, 76, 3, 2, 2, 2, 78, 79, 3, 2, 2, 2, 79, 81, 3, 2, 2, 2, 80, 78, 3, 2, 2, 2, 81, 82, 7, 36, 2, 2, 82, 26, 3, 2, 2, 2, 83, 84, 7, 63, 2, 2, 84, 28, 3, 2, 2, 2, 85, 89, 9, 5, 2, 2, 86, 88, 9, 6, 2, 2, 87, 86, 3, 2, 2, 2, 88, 91, 3, 2, 2, 2, 89, 87, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 30, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 92, 94, 9, 7, 2, 2, 93, 92, 3, 2, 2, 2, 94, 95, 3, 2, 2, 2, 95, 93, 3, 2, 2, 2, 95, 96, 3, 2, 2, 2, 96, 32, 3, 2, 2, 2, 9, 2, 51, 63, 72, 78, 89, 95, 2]
\ No newline at end of file
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 17, 108, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 5, 2, 40, 10, 2, 3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 46, 10, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 4, 54, 10, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 6, 7, 61, 10, 7, 13, 7, 14, 7, 62, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 7, 11, 73, 10, 11, 12, 11, 14, 11, 76, 11, 11, 3, 11, 3, 11, 3, 12, 3, 12, 7, 12, 82, 10, 12, 12, 12, 14, 12, 85, 11, 12, 3, 13, 7, 13, 88, 10, 13, 12, 13, 14, 13, 91, 11, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 15, 3, 15, 7, 15, 99, 10, 15, 12, 15, 14, 15, 102, 11, 15, 3, 16, 6, 16, 105, 10, 16, 13, 16, 14, 16, 106, 2, 2, 2, 17, 3, 2, 3, 5, 2, 4, 7, 2, 5, 9, 2, 6, 11, 2, 7, 13, 2, 8, 15, 2, 9, 17, 2, 10, 19, 2, 11, 21, 2, 12, 23, 2, 13, 25, 2, 14, 27, 2, 15, 29, 2, 16, 31, 2, 17, 3, 2, 8, 3, 2, 50, 59, 6, 2, 12, 12, 15, 15, 36, 36, 94, 94, 9, 2, 12, 12, 15, 15, 36, 36, 42, 43, 60, 60, 63, 63, 94, 94, 6, 2, 44, 44, 67, 92, 97, 97, 99, 124, 7, 2, 44, 44, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 2, 116, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 2, 29, 3, 2, 2, 2, 2, 31, 3, 2, 2, 2, 3, 39, 3, 2, 2, 2, 5, 45, 3, 2, 2, 2, 7, 53, 3, 2, 2, 2, 9, 55, 3, 2, 2, 2, 11, 57, 3, 2, 2, 2, 13, 60, 3, 2, 2, 2, 15, 64, 3, 2, 2, 2, 17, 66, 3, 2, 2, 2, 19, 68, 3, 2, 2, 2, 21, 70, 3, 2, 2, 2, 23, 79, 3, 2, 2, 2, 25, 89, 3, 2, 2, 2, 27, 94, 3, 2, 2, 2, 29, 96, 3, 2, 2, 2, 31, 104, 3, 2, 2, 2, 33, 34, 7, 99, 2, 2, 34, 35, 7, 112, 2, 2, 35, 40, 7, 102, 2, 2, 36, 37, 7, 67, 2, 2, 37, 38, 7, 80, 2, 2, 38, 40, 7, 70, 2, 2, 39, 33, 3, 2, 2, 2, 39, 36, 3, 2, 2, 2, 40, 4, 3, 2, 2, 2, 41, 42, 7, 113, 2, 2, 42, 46, 7, 116, 2, 2, 43, 44, 7, 81, 2, 2, 44, 46, 7, 84, 2, 2, 45, 41, 3, 2, 2, 2, 45, 43, 3, 2, 2, 2, 46, 6, 3, 2, 2, 2, 47, 48, 7, 112, 2, 2, 48, 49, 7, 113, 2, 2, 49, 54, 7, 118, 2, 2, 50, 51, 7, 80, 2, 2, 51, 52, 7, 81, 2, 2, 52, 54, 7, 86, 2, 2, 53, 47, 3, 2, 2, 2, 53, 50, 3, 2, 2, 2, 54, 8, 3, 2, 2, 2, 55, 56, 7, 44, 2, 2, 56, 10, 3, 2, 2, 2, 57, 58, 7, 45, 2, 2, 58, 12, 3, 2, 2, 2, 59, 61, 9, 2, 2, 2, 60, 59, 3, 2, 2, 2, 61, 62, 3, 2, 2, 2, 62, 60, 3, 2, 2, 2, 62, 63, 3, 2, 2, 2, 63, 14, 3, 2, 2, 2, 64, 65, 7, 60, 2, 2, 65, 16, 3, 2, 2, 2, 66, 67, 7, 42, 2, 2, 67, 18, 3, 2, 2, 2, 68, 69, 7, 43, 2, 2, 69, 20, 3, 2, 2, 2, 70, 74, 7, 36, 2, 2, 71, 73, 10, 3, 2, 2, 72, 71, 3, 2, 2, 2, 73, 76, 3, 2, 2, 2, 74, 72, 3, 2, 2, 2, 74, 75, 3, 2, 2, 2, 75, 77, 3, 2, 2, 2, 76, 74, 3, 2, 2, 2, 77, 78, 7, 36, 2, 2, 78, 22, 3, 2, 2, 2, 79, 83, 7, 36, 2, 2, 80, 82, 10, 4, 2, 2, 81, 80, 3, 2, 2, 2, 82, 85, 3, 2, 2, 2, 83, 81, 3, 2, 2, 2, 83, 84, 3, 2, 2, 2, 84, 24, 3, 2, 2, 2, 85, 83, 3, 2, 2, 2, 86, 88, 10, 4, 2, 2, 87, 86, 3, 2, 2, 2, 88, 91, 3, 2, 2, 2, 89, 87, 3, 2, 2, 2, 89, 90, 3, 2, 2, 2, 90, 92, 3, 2, 2, 2, 91, 89, 3, 2, 2, 2, 92, 93, 7, 36, 2, 2, 93, 26, 3, 2, 2, 2, 94, 95, 7, 63, 2, 2, 95, 28, 3, 2, 2, 2, 96, 100, 9, 5, 2, 2, 97, 99, 9, 6, 2, 2, 98, 97, 3, 2, 2, 2, 99, 102, 3, 2, 2, 2, 100, 98, 3, 2, 2, 2, 100, 101, 3, 2, 2, 2, 101, 30, 3, 2, 2, 2, 102, 100, 3, 2, 2, 2, 103, 105, 9, 7, 2, 2, 104, 103, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 104, 3, 2, 2, 2, 106, 107, 3, 2, 2, 2, 107, 32, 3, 2, 2, 2, 12, 2, 39, 45, 53, 62, 74, 83, 89, 100, 106, 2]
\ No newline at end of file
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.tokens b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.tokens
index 1e36f3f8cb6db..79e1f9ad84007 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.tokens
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.tokens
@@ -13,9 +13,6 @@ INCOMPLETE_RIGHT_QUOTED_STRING=12
 EQUAL=13
 IDENTIFIER=14
 WS=15
-'and'=1
-'or'=2
-'not'=3
 '*'=4
 '+'=5
 ':'=7
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.ts b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.ts
index 2f7e426f4fd50..14f586a957d02 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteLexer.ts
@@ -52,9 +52,9 @@ export class SelectionAutoCompleteLexer extends Lexer {
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
@@ -128,48 +128,52 @@ export class SelectionAutoCompleteLexer extends Lexer {
   }
 
   public static readonly _serializedATN: string =
-    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x11a\b\x01\x04' +
+    '\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\x11l\b\x01\x04' +
     '\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04' +
     '\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r' +
     '\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x03\x02\x03\x02\x03\x02\x03' +
-    '\x02\x03\x03\x03\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03' +
-    '\x05\x03\x06\x03\x06\x03\x07\x06\x072\n\x07\r\x07\x0E\x073\x03\b\x03\b' +
-    '\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x07\v>\n\v\f\v\x0E\vA\v\v\x03\v\x03' +
-    '\v\x03\f\x03\f\x07\fG\n\f\f\f\x0E\fJ\v\f\x03\r\x07\rM\n\r\f\r\x0E\rP\v' +
-    '\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x07\x0FX\n\x0F\f\x0F\x0E' +
-    '\x0F[\v\x0F\x03\x10\x06\x10^\n\x10\r\x10\x0E\x10_\x02\x02\x02\x11\x03' +
-    '\x02\x03\x05\x02\x04\x07\x02\x05\t\x02\x06\v\x02\x07\r\x02\b\x0F\x02\t' +
-    '\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02\r\x19\x02\x0E\x1B\x02\x0F\x1D\x02' +
-    '\x10\x1F\x02\x11\x03\x02\b\x03\x022;\x06\x02\f\f\x0F\x0F$$^^\t\x02\f\f' +
-    '\x0F\x0F$$*+<<??^^\x06\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05\x02\v\f\x0F' +
-    '\x0F""\x02f\x02\x03\x03\x02\x02\x02\x02\x05\x03\x02\x02\x02\x02\x07' +
-    '\x03\x02\x02\x02\x02\t\x03\x02\x02\x02\x02\v\x03\x02\x02\x02\x02\r\x03' +
-    '\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02\x11\x03\x02\x02\x02\x02\x13\x03' +
-    '\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02\x17\x03\x02\x02\x02\x02\x19\x03' +
-    '\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02\x1D\x03\x02\x02\x02\x02\x1F\x03' +
-    '\x02\x02\x02\x03!\x03\x02\x02\x02\x05%\x03\x02\x02\x02\x07(\x03\x02\x02' +
-    '\x02\t,\x03\x02\x02\x02\v.\x03\x02\x02\x02\r1\x03\x02\x02\x02\x0F5\x03' +
-    '\x02\x02\x02\x117\x03\x02\x02\x02\x139\x03\x02\x02\x02\x15;\x03\x02\x02' +
-    '\x02\x17D\x03\x02\x02\x02\x19N\x03\x02\x02\x02\x1BS\x03\x02\x02\x02\x1D' +
-    'U\x03\x02\x02\x02\x1F]\x03\x02\x02\x02!"\x07c\x02\x02"#\x07p\x02\x02' +
-    "#$\x07f\x02\x02$\x04\x03\x02\x02\x02%&\x07q\x02\x02&'\x07t\x02\x02'" +
-    '\x06\x03\x02\x02\x02()\x07p\x02\x02)*\x07q\x02\x02*+\x07v\x02\x02+\b\x03' +
-    '\x02\x02\x02,-\x07,\x02\x02-\n\x03\x02\x02\x02./\x07-\x02\x02/\f\x03\x02' +
-    '\x02\x0202\t\x02\x02\x0210\x03\x02\x02\x0223\x03\x02\x02\x0231\x03\x02' +
-    '\x02\x0234\x03\x02\x02\x024\x0E\x03\x02\x02\x0256\x07<\x02\x026\x10\x03' +
-    '\x02\x02\x0278\x07*\x02\x028\x12\x03\x02\x02\x029:\x07+\x02\x02:\x14\x03' +
-    '\x02\x02\x02;?\x07$\x02\x02<>\n\x03\x02\x02=<\x03\x02\x02\x02>A\x03\x02' +
-    '\x02\x02?=\x03\x02\x02\x02?@\x03\x02\x02\x02@B\x03\x02\x02\x02A?\x03\x02' +
-    '\x02\x02BC\x07$\x02\x02C\x16\x03\x02\x02\x02DH\x07$\x02\x02EG\n\x04\x02' +
-    '\x02FE\x03\x02\x02\x02GJ\x03\x02\x02\x02HF\x03\x02\x02\x02HI\x03\x02\x02' +
-    '\x02I\x18\x03\x02\x02\x02JH\x03\x02\x02\x02KM\n\x04\x02\x02LK\x03\x02' +
-    '\x02\x02MP\x03\x02\x02\x02NL\x03\x02\x02\x02NO\x03\x02\x02\x02OQ\x03\x02' +
-    '\x02\x02PN\x03\x02\x02\x02QR\x07$\x02\x02R\x1A\x03\x02\x02\x02ST\x07?' +
-    '\x02\x02T\x1C\x03\x02\x02\x02UY\t\x05\x02\x02VX\t\x06\x02\x02WV\x03\x02' +
-    '\x02\x02X[\x03\x02\x02\x02YW\x03\x02\x02\x02YZ\x03\x02\x02\x02Z\x1E\x03' +
-    '\x02\x02\x02[Y\x03\x02\x02\x02\\^\t\x07\x02\x02]\\\x03\x02\x02\x02^_\x03' +
-    '\x02\x02\x02_]\x03\x02\x02\x02_`\x03\x02\x02\x02` \x03\x02\x02\x02\t\x02' +
-    '3?HNY_\x02';
+    '\x02\x03\x02\x03\x02\x05\x02(\n\x02\x03\x03\x03\x03\x03\x03\x03\x03\x05' +
+    '\x03.\n\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x05\x046\n' +
+    '\x04\x03\x05\x03\x05\x03\x06\x03\x06\x03\x07\x06\x07=\n\x07\r\x07\x0E' +
+    '\x07>\x03\b\x03\b\x03\t\x03\t\x03\n\x03\n\x03\v\x03\v\x07\vI\n\v\f\v\x0E' +
+    '\vL\v\v\x03\v\x03\v\x03\f\x03\f\x07\fR\n\f\f\f\x0E\fU\v\f\x03\r\x07\r' +
+    'X\n\r\f\r\x0E\r[\v\r\x03\r\x03\r\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x07\x0F' +
+    'c\n\x0F\f\x0F\x0E\x0Ff\v\x0F\x03\x10\x06\x10i\n\x10\r\x10\x0E\x10j\x02' +
+    '\x02\x02\x11\x03\x02\x03\x05\x02\x04\x07\x02\x05\t\x02\x06\v\x02\x07\r' +
+    '\x02\b\x0F\x02\t\x11\x02\n\x13\x02\v\x15\x02\f\x17\x02\r\x19\x02\x0E\x1B' +
+    '\x02\x0F\x1D\x02\x10\x1F\x02\x11\x03\x02\b\x03\x022;\x06\x02\f\f\x0F\x0F' +
+    '$$^^\t\x02\f\f\x0F\x0F$$*+<<??^^\x06\x02,,C\\aac|\x07\x02,,2;C\\aac|\x05' +
+    '\x02\v\f\x0F\x0F""\x02t\x02\x03\x03\x02\x02\x02\x02\x05\x03\x02\x02' +
+    '\x02\x02\x07\x03\x02\x02\x02\x02\t\x03\x02\x02\x02\x02\v\x03\x02\x02\x02' +
+    '\x02\r\x03\x02\x02\x02\x02\x0F\x03\x02\x02\x02\x02\x11\x03\x02\x02\x02' +
+    '\x02\x13\x03\x02\x02\x02\x02\x15\x03\x02\x02\x02\x02\x17\x03\x02\x02\x02' +
+    '\x02\x19\x03\x02\x02\x02\x02\x1B\x03\x02\x02\x02\x02\x1D\x03\x02\x02\x02' +
+    "\x02\x1F\x03\x02\x02\x02\x03'\x03\x02\x02\x02\x05-\x03\x02\x02\x02\x07" +
+    '5\x03\x02\x02\x02\t7\x03\x02\x02\x02\v9\x03\x02\x02\x02\r<\x03\x02\x02' +
+    '\x02\x0F@\x03\x02\x02\x02\x11B\x03\x02\x02\x02\x13D\x03\x02\x02\x02\x15' +
+    'F\x03\x02\x02\x02\x17O\x03\x02\x02\x02\x19Y\x03\x02\x02\x02\x1B^\x03\x02' +
+    '\x02\x02\x1D`\x03\x02\x02\x02\x1Fh\x03\x02\x02\x02!"\x07c\x02\x02"#' +
+    '\x07p\x02\x02#(\x07f\x02\x02$%\x07C\x02\x02%&\x07P\x02\x02&(\x07F\x02' +
+    "\x02'!\x03\x02\x02\x02'$\x03\x02\x02\x02(\x04\x03\x02\x02\x02)*\x07" +
+    'q\x02\x02*.\x07t\x02\x02+,\x07Q\x02\x02,.\x07T\x02\x02-)\x03\x02\x02\x02' +
+    '-+\x03\x02\x02\x02.\x06\x03\x02\x02\x02/0\x07p\x02\x0201\x07q\x02\x02' +
+    '16\x07v\x02\x0223\x07P\x02\x0234\x07Q\x02\x0246\x07V\x02\x025/\x03\x02' +
+    '\x02\x0252\x03\x02\x02\x026\b\x03\x02\x02\x0278\x07,\x02\x028\n\x03\x02' +
+    '\x02\x029:\x07-\x02\x02:\f\x03\x02\x02\x02;=\t\x02\x02\x02<;\x03\x02\x02' +
+    '\x02=>\x03\x02\x02\x02><\x03\x02\x02\x02>?\x03\x02\x02\x02?\x0E\x03\x02' +
+    '\x02\x02@A\x07<\x02\x02A\x10\x03\x02\x02\x02BC\x07*\x02\x02C\x12\x03\x02' +
+    '\x02\x02DE\x07+\x02\x02E\x14\x03\x02\x02\x02FJ\x07$\x02\x02GI\n\x03\x02' +
+    '\x02HG\x03\x02\x02\x02IL\x03\x02\x02\x02JH\x03\x02\x02\x02JK\x03\x02\x02' +
+    '\x02KM\x03\x02\x02\x02LJ\x03\x02\x02\x02MN\x07$\x02\x02N\x16\x03\x02\x02' +
+    '\x02OS\x07$\x02\x02PR\n\x04\x02\x02QP\x03\x02\x02\x02RU\x03\x02\x02\x02' +
+    'SQ\x03\x02\x02\x02ST\x03\x02\x02\x02T\x18\x03\x02\x02\x02US\x03\x02\x02' +
+    '\x02VX\n\x04\x02\x02WV\x03\x02\x02\x02X[\x03\x02\x02\x02YW\x03\x02\x02' +
+    '\x02YZ\x03\x02\x02\x02Z\\\x03\x02\x02\x02[Y\x03\x02\x02\x02\\]\x07$\x02' +
+    '\x02]\x1A\x03\x02\x02\x02^_\x07?\x02\x02_\x1C\x03\x02\x02\x02`d\t\x05' +
+    '\x02\x02ac\t\x06\x02\x02ba\x03\x02\x02\x02cf\x03\x02\x02\x02db\x03\x02' +
+    '\x02\x02de\x03\x02\x02\x02e\x1E\x03\x02\x02\x02fd\x03\x02\x02\x02gi\t' +
+    '\x07\x02\x02hg\x03\x02\x02\x02ij\x03\x02\x02\x02jh\x03\x02\x02\x02jk\x03' +
+    "\x02\x02\x02k \x03\x02\x02\x02\f\x02'-5>JSYdj\x02";
   public static __ATN: ATN;
   public static get _ATN(): ATN {
     if (!SelectionAutoCompleteLexer.__ATN) {
diff --git a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteParser.ts b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteParser.ts
index 9a9753ec06c7e..636296f9f2f1b 100644
--- a/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteParser.ts
+++ b/js_modules/dagster-ui/packages/ui-core/src/selection/generated/SelectionAutoCompleteParser.ts
@@ -99,9 +99,9 @@ export class SelectionAutoCompleteParser extends Parser {
 
   private static readonly _LITERAL_NAMES: Array<string | undefined> = [
     undefined,
-    "'and'",
-    "'or'",
-    "'not'",
+    undefined,
+    undefined,
+    undefined,
     "'*'",
     "'+'",
     undefined,
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/AssetSelection.g4 b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/AssetSelection.g4
index e69c2195287a3..d7d69c8ab0c6d 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/AssetSelection.g4
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/AssetSelection.g4
@@ -49,9 +49,9 @@ keyValue:
 	| UNQUOTED_WILDCARD_STRING;
 
 // Operators and keywords
-AND: 'and';
-OR: 'or';
-NOT: 'not';
+AND: 'and' | 'AND';
+OR: 'or' | 'OR';
+NOT: 'not' | 'NOT';
 
 STAR: '*';
 PLUS: '+';
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.interp b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.interp
index 4c9b808ff6714..893282018c07e 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.interp
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.interp
@@ -1,9 +1,9 @@
 token literal names:
 null
 '='
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.tokens b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.tokens
index 373465d0bd09c..5ce47397a8001 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.tokens
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelection.tokens
@@ -26,9 +26,6 @@ UNQUOTED_STRING=25
 UNQUOTED_WILDCARD_STRING=26
 WS=27
 '='=1
-'and'=2
-'or'=3
-'not'=4
 '*'=5
 '+'=6
 ':'=8
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.interp b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.interp
index 41630d1fa8013..3091f1041738d 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.interp
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.interp
@@ -1,9 +1,9 @@
 token literal names:
 null
 '='
-'and'
-'or'
-'not'
+null
+null
+null
 '*'
 '+'
 null
@@ -95,4 +95,4 @@ mode names:
 DEFAULT_MODE
 
 atn:
-[4, 0, 27, 213, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 4, 6, 74, 8, 6, 11, 6, 12, 6, 75, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 5, 23, 186, 8, 23, 10, 23, 12, 23, 189, 9, 23, 1, 23, 1, 23, 1, 24, 1, 24, 5, 24, 195, 8, 24, 10, 24, 12, 24, 198, 9, 24, 1, 25, 1, 25, 5, 25, 202, 8, 25, 10, 25, 12, 25, 205, 9, 25, 1, 26, 4, 26, 208, 8, 26, 11, 26, 12, 26, 209, 1, 26, 1, 26, 0, 0, 27, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 1, 0, 7, 1, 0, 48, 57, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 4, 0, 42, 42, 65, 90, 95, 95, 97, 122, 5, 0, 42, 42, 48, 57, 65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 217, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 1, 55, 1, 0, 0, 0, 3, 57, 1, 0, 0, 0, 5, 61, 1, 0, 0, 0, 7, 64, 1, 0, 0, 0, 9, 68, 1, 0, 0, 0, 11, 70, 1, 0, 0, 0, 13, 73, 1, 0, 0, 0, 15, 77, 1, 0, 0, 0, 17, 79, 1, 0, 0, 0, 19, 81, 1, 0, 0, 0, 21, 83, 1, 0, 0, 0, 23, 85, 1, 0, 0, 0, 25, 89, 1, 0, 0, 0, 27, 95, 1, 0, 0, 0, 29, 101, 1, 0, 0, 0, 31, 105, 1, 0, 0, 0, 33, 110, 1, 0, 0, 0, 35, 124, 1, 0, 0, 0, 37, 131, 1, 0, 0, 0, 39, 142, 1, 0, 0, 0, 41, 153, 1, 0, 0, 0, 43, 171, 1, 0, 0, 0, 45, 177, 1, 0, 0, 0, 47, 183, 1, 0, 0, 0, 49, 192, 1, 0, 0, 0, 51, 199, 1, 0, 0, 0, 53, 207, 1, 0, 0, 0, 55, 56, 5, 61, 0, 0, 56, 2, 1, 0, 0, 0, 57, 58, 5, 97, 0, 0, 58, 59, 5, 110, 0, 0, 59, 60, 5, 100, 0, 0, 60, 4, 1, 0, 0, 0, 61, 62, 5, 111, 0, 0, 62, 63, 5, 114, 0, 0, 63, 6, 1, 0, 0, 0, 64, 65, 5, 110, 0, 0, 65, 66, 5, 111, 0, 0, 66, 67, 5, 116, 0, 0, 67, 8, 1, 0, 0, 0, 68, 69, 5, 42, 0, 0, 69, 10, 1, 0, 0, 0, 70, 71, 5, 43, 0, 0, 71, 12, 1, 0, 0, 0, 72, 74, 7, 0, 0, 0, 73, 72, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 14, 1, 0, 0, 0, 77, 78, 5, 58, 0, 0, 78, 16, 1, 0, 0, 0, 79, 80, 5, 40, 0, 0, 80, 18, 1, 0, 0, 0, 81, 82, 5, 41, 0, 0, 82, 20, 1, 0, 0, 0, 83, 84, 5, 44, 0, 0, 84, 22, 1, 0, 0, 0, 85, 86, 5, 107, 0, 0, 86, 87, 5, 101, 0, 0, 87, 88, 5, 121, 0, 0, 88, 24, 1, 0, 0, 0, 89, 90, 5, 111, 0, 0, 90, 91, 5, 119, 0, 0, 91, 92, 5, 110, 0, 0, 92, 93, 5, 101, 0, 0, 93, 94, 5, 114, 0, 0, 94, 26, 1, 0, 0, 0, 95, 96, 5, 103, 0, 0, 96, 97, 5, 114, 0, 0, 97, 98, 5, 111, 0, 0, 98, 99, 5, 117, 0, 0, 99, 100, 5, 112, 0, 0, 100, 28, 1, 0, 0, 0, 101, 102, 5, 116, 0, 0, 102, 103, 5, 97, 0, 0, 103, 104, 5, 103, 0, 0, 104, 30, 1, 0, 0, 0, 105, 106, 5, 107, 0, 0, 106, 107, 5, 105, 0, 0, 107, 108, 5, 110, 0, 0, 108, 109, 5, 100, 0, 0, 109, 32, 1, 0, 0, 0, 110, 111, 5, 99, 0, 0, 111, 112, 5, 111, 0, 0, 112, 113, 5, 100, 0, 0, 113, 114, 5, 101, 0, 0, 114, 115, 5, 95, 0, 0, 115, 116, 5, 108, 0, 0, 116, 117, 5, 111, 0, 0, 117, 118, 5, 99, 0, 0, 118, 119, 5, 97, 0, 0, 119, 120, 5, 116, 0, 0, 120, 121, 5, 105, 0, 0, 121, 122, 5, 111, 0, 0, 122, 123, 5, 110, 0, 0, 123, 34, 1, 0, 0, 0, 124, 125, 5, 99, 0, 0, 125, 126, 5, 111, 0, 0, 126, 127, 5, 108, 0, 0, 127, 128, 5, 117, 0, 0, 128, 129, 5, 109, 0, 0, 129, 130, 5, 110, 0, 0, 130, 36, 1, 0, 0, 0, 131, 132, 5, 116, 0, 0, 132, 133, 5, 97, 0, 0, 133, 134, 5, 98, 0, 0, 134, 135, 5, 108, 0, 0, 135, 136, 5, 101, 0, 0, 136, 137, 5, 95, 0, 0, 137, 138, 5, 110, 0, 0, 138, 139, 5, 97, 0, 0, 139, 140, 5, 109, 0, 0, 140, 141, 5, 101, 0, 0, 141, 38, 1, 0, 0, 0, 142, 143, 5, 99, 0, 0, 143, 144, 5, 111, 0, 0, 144, 145, 5, 108, 0, 0, 145, 146, 5, 117, 0, 0, 146, 147, 5, 109, 0, 0, 147, 148, 5, 110, 0, 0, 148, 149, 5, 95, 0, 0, 149, 150, 5, 116, 0, 0, 150, 151, 5, 97, 0, 0, 151, 152, 5, 103, 0, 0, 152, 40, 1, 0, 0, 0, 153, 154, 5, 99, 0, 0, 154, 155, 5, 104, 0, 0, 155, 156, 5, 97, 0, 0, 156, 157, 5, 110, 0, 0, 157, 158, 5, 103, 0, 0, 158, 159, 5, 101, 0, 0, 159, 160, 5, 100, 0, 0, 160, 161, 5, 95, 0, 0, 161, 162, 5, 105, 0, 0, 162, 163, 5, 110, 0, 0, 163, 164, 5, 95, 0, 0, 164, 165, 5, 98, 0, 0, 165, 166, 5, 114, 0, 0, 166, 167, 5, 97, 0, 0, 167, 168, 5, 110, 0, 0, 168, 169, 5, 99, 0, 0, 169, 170, 5, 104, 0, 0, 170, 42, 1, 0, 0, 0, 171, 172, 5, 115, 0, 0, 172, 173, 5, 105, 0, 0, 173, 174, 5, 110, 0, 0, 174, 175, 5, 107, 0, 0, 175, 176, 5, 115, 0, 0, 176, 44, 1, 0, 0, 0, 177, 178, 5, 114, 0, 0, 178, 179, 5, 111, 0, 0, 179, 180, 5, 111, 0, 0, 180, 181, 5, 116, 0, 0, 181, 182, 5, 115, 0, 0, 182, 46, 1, 0, 0, 0, 183, 187, 5, 34, 0, 0, 184, 186, 8, 1, 0, 0, 185, 184, 1, 0, 0, 0, 186, 189, 1, 0, 0, 0, 187, 185, 1, 0, 0, 0, 187, 188, 1, 0, 0, 0, 188, 190, 1, 0, 0, 0, 189, 187, 1, 0, 0, 0, 190, 191, 5, 34, 0, 0, 191, 48, 1, 0, 0, 0, 192, 196, 7, 2, 0, 0, 193, 195, 7, 3, 0, 0, 194, 193, 1, 0, 0, 0, 195, 198, 1, 0, 0, 0, 196, 194, 1, 0, 0, 0, 196, 197, 1, 0, 0, 0, 197, 50, 1, 0, 0, 0, 198, 196, 1, 0, 0, 0, 199, 203, 7, 4, 0, 0, 200, 202, 7, 5, 0, 0, 201, 200, 1, 0, 0, 0, 202, 205, 1, 0, 0, 0, 203, 201, 1, 0, 0, 0, 203, 204, 1, 0, 0, 0, 204, 52, 1, 0, 0, 0, 205, 203, 1, 0, 0, 0, 206, 208, 7, 6, 0, 0, 207, 206, 1, 0, 0, 0, 208, 209, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 209, 210, 1, 0, 0, 0, 210, 211, 1, 0, 0, 0, 211, 212, 6, 26, 0, 0, 212, 54, 1, 0, 0, 0, 6, 0, 75, 187, 196, 203, 209, 1, 6, 0, 0]
\ No newline at end of file
+[4, 0, 27, 224, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 64, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 70, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 78, 8, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 4, 6, 85, 8, 6, 11, 6, 12, 6, 86, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 5, 23, 197, 8, 23, 10, 23, 12, 23, 200, 9, 23, 1, 23, 1, 23, 1, 24, 1, 24, 5, 24, 206, 8, 24, 10, 24, 12, 24, 209, 9, 24, 1, 25, 1, 25, 5, 25, 213, 8, 25, 10, 25, 12, 25, 216, 9, 25, 1, 26, 4, 26, 219, 8, 26, 11, 26, 12, 26, 220, 1, 26, 1, 26, 0, 0, 27, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 1, 0, 7, 1, 0, 48, 57, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 4, 0, 42, 42, 65, 90, 95, 95, 97, 122, 5, 0, 42, 42, 48, 57, 65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 231, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 1, 55, 1, 0, 0, 0, 3, 63, 1, 0, 0, 0, 5, 69, 1, 0, 0, 0, 7, 77, 1, 0, 0, 0, 9, 79, 1, 0, 0, 0, 11, 81, 1, 0, 0, 0, 13, 84, 1, 0, 0, 0, 15, 88, 1, 0, 0, 0, 17, 90, 1, 0, 0, 0, 19, 92, 1, 0, 0, 0, 21, 94, 1, 0, 0, 0, 23, 96, 1, 0, 0, 0, 25, 100, 1, 0, 0, 0, 27, 106, 1, 0, 0, 0, 29, 112, 1, 0, 0, 0, 31, 116, 1, 0, 0, 0, 33, 121, 1, 0, 0, 0, 35, 135, 1, 0, 0, 0, 37, 142, 1, 0, 0, 0, 39, 153, 1, 0, 0, 0, 41, 164, 1, 0, 0, 0, 43, 182, 1, 0, 0, 0, 45, 188, 1, 0, 0, 0, 47, 194, 1, 0, 0, 0, 49, 203, 1, 0, 0, 0, 51, 210, 1, 0, 0, 0, 53, 218, 1, 0, 0, 0, 55, 56, 5, 61, 0, 0, 56, 2, 1, 0, 0, 0, 57, 58, 5, 97, 0, 0, 58, 59, 5, 110, 0, 0, 59, 64, 5, 100, 0, 0, 60, 61, 5, 65, 0, 0, 61, 62, 5, 78, 0, 0, 62, 64, 5, 68, 0, 0, 63, 57, 1, 0, 0, 0, 63, 60, 1, 0, 0, 0, 64, 4, 1, 0, 0, 0, 65, 66, 5, 111, 0, 0, 66, 70, 5, 114, 0, 0, 67, 68, 5, 79, 0, 0, 68, 70, 5, 82, 0, 0, 69, 65, 1, 0, 0, 0, 69, 67, 1, 0, 0, 0, 70, 6, 1, 0, 0, 0, 71, 72, 5, 110, 0, 0, 72, 73, 5, 111, 0, 0, 73, 78, 5, 116, 0, 0, 74, 75, 5, 78, 0, 0, 75, 76, 5, 79, 0, 0, 76, 78, 5, 84, 0, 0, 77, 71, 1, 0, 0, 0, 77, 74, 1, 0, 0, 0, 78, 8, 1, 0, 0, 0, 79, 80, 5, 42, 0, 0, 80, 10, 1, 0, 0, 0, 81, 82, 5, 43, 0, 0, 82, 12, 1, 0, 0, 0, 83, 85, 7, 0, 0, 0, 84, 83, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 86, 87, 1, 0, 0, 0, 87, 14, 1, 0, 0, 0, 88, 89, 5, 58, 0, 0, 89, 16, 1, 0, 0, 0, 90, 91, 5, 40, 0, 0, 91, 18, 1, 0, 0, 0, 92, 93, 5, 41, 0, 0, 93, 20, 1, 0, 0, 0, 94, 95, 5, 44, 0, 0, 95, 22, 1, 0, 0, 0, 96, 97, 5, 107, 0, 0, 97, 98, 5, 101, 0, 0, 98, 99, 5, 121, 0, 0, 99, 24, 1, 0, 0, 0, 100, 101, 5, 111, 0, 0, 101, 102, 5, 119, 0, 0, 102, 103, 5, 110, 0, 0, 103, 104, 5, 101, 0, 0, 104, 105, 5, 114, 0, 0, 105, 26, 1, 0, 0, 0, 106, 107, 5, 103, 0, 0, 107, 108, 5, 114, 0, 0, 108, 109, 5, 111, 0, 0, 109, 110, 5, 117, 0, 0, 110, 111, 5, 112, 0, 0, 111, 28, 1, 0, 0, 0, 112, 113, 5, 116, 0, 0, 113, 114, 5, 97, 0, 0, 114, 115, 5, 103, 0, 0, 115, 30, 1, 0, 0, 0, 116, 117, 5, 107, 0, 0, 117, 118, 5, 105, 0, 0, 118, 119, 5, 110, 0, 0, 119, 120, 5, 100, 0, 0, 120, 32, 1, 0, 0, 0, 121, 122, 5, 99, 0, 0, 122, 123, 5, 111, 0, 0, 123, 124, 5, 100, 0, 0, 124, 125, 5, 101, 0, 0, 125, 126, 5, 95, 0, 0, 126, 127, 5, 108, 0, 0, 127, 128, 5, 111, 0, 0, 128, 129, 5, 99, 0, 0, 129, 130, 5, 97, 0, 0, 130, 131, 5, 116, 0, 0, 131, 132, 5, 105, 0, 0, 132, 133, 5, 111, 0, 0, 133, 134, 5, 110, 0, 0, 134, 34, 1, 0, 0, 0, 135, 136, 5, 99, 0, 0, 136, 137, 5, 111, 0, 0, 137, 138, 5, 108, 0, 0, 138, 139, 5, 117, 0, 0, 139, 140, 5, 109, 0, 0, 140, 141, 5, 110, 0, 0, 141, 36, 1, 0, 0, 0, 142, 143, 5, 116, 0, 0, 143, 144, 5, 97, 0, 0, 144, 145, 5, 98, 0, 0, 145, 146, 5, 108, 0, 0, 146, 147, 5, 101, 0, 0, 147, 148, 5, 95, 0, 0, 148, 149, 5, 110, 0, 0, 149, 150, 5, 97, 0, 0, 150, 151, 5, 109, 0, 0, 151, 152, 5, 101, 0, 0, 152, 38, 1, 0, 0, 0, 153, 154, 5, 99, 0, 0, 154, 155, 5, 111, 0, 0, 155, 156, 5, 108, 0, 0, 156, 157, 5, 117, 0, 0, 157, 158, 5, 109, 0, 0, 158, 159, 5, 110, 0, 0, 159, 160, 5, 95, 0, 0, 160, 161, 5, 116, 0, 0, 161, 162, 5, 97, 0, 0, 162, 163, 5, 103, 0, 0, 163, 40, 1, 0, 0, 0, 164, 165, 5, 99, 0, 0, 165, 166, 5, 104, 0, 0, 166, 167, 5, 97, 0, 0, 167, 168, 5, 110, 0, 0, 168, 169, 5, 103, 0, 0, 169, 170, 5, 101, 0, 0, 170, 171, 5, 100, 0, 0, 171, 172, 5, 95, 0, 0, 172, 173, 5, 105, 0, 0, 173, 174, 5, 110, 0, 0, 174, 175, 5, 95, 0, 0, 175, 176, 5, 98, 0, 0, 176, 177, 5, 114, 0, 0, 177, 178, 5, 97, 0, 0, 178, 179, 5, 110, 0, 0, 179, 180, 5, 99, 0, 0, 180, 181, 5, 104, 0, 0, 181, 42, 1, 0, 0, 0, 182, 183, 5, 115, 0, 0, 183, 184, 5, 105, 0, 0, 184, 185, 5, 110, 0, 0, 185, 186, 5, 107, 0, 0, 186, 187, 5, 115, 0, 0, 187, 44, 1, 0, 0, 0, 188, 189, 5, 114, 0, 0, 189, 190, 5, 111, 0, 0, 190, 191, 5, 111, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 115, 0, 0, 193, 46, 1, 0, 0, 0, 194, 198, 5, 34, 0, 0, 195, 197, 8, 1, 0, 0, 196, 195, 1, 0, 0, 0, 197, 200, 1, 0, 0, 0, 198, 196, 1, 0, 0, 0, 198, 199, 1, 0, 0, 0, 199, 201, 1, 0, 0, 0, 200, 198, 1, 0, 0, 0, 201, 202, 5, 34, 0, 0, 202, 48, 1, 0, 0, 0, 203, 207, 7, 2, 0, 0, 204, 206, 7, 3, 0, 0, 205, 204, 1, 0, 0, 0, 206, 209, 1, 0, 0, 0, 207, 205, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 50, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 210, 214, 7, 4, 0, 0, 211, 213, 7, 5, 0, 0, 212, 211, 1, 0, 0, 0, 213, 216, 1, 0, 0, 0, 214, 212, 1, 0, 0, 0, 214, 215, 1, 0, 0, 0, 215, 52, 1, 0, 0, 0, 216, 214, 1, 0, 0, 0, 217, 219, 7, 6, 0, 0, 218, 217, 1, 0, 0, 0, 219, 220, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 223, 6, 26, 0, 0, 223, 54, 1, 0, 0, 0, 9, 0, 63, 69, 77, 86, 198, 207, 214, 220, 1, 6, 0, 0]
\ No newline at end of file
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.py b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.py
index 9c812f26a922c..f209fc73cd591 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.py
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.py
@@ -12,7 +12,7 @@ def serializedATN():
         4,
         0,
         27,
-        213,
+        224,
         6,
         -1,
         2,
@@ -136,11 +136,31 @@ def serializedATN():
         1,
         1,
         1,
+        1,
+        1,
+        1,
+        3,
+        1,
+        64,
+        8,
+        1,
+        1,
+        2,
+        1,
         2,
         1,
         2,
         1,
         2,
+        3,
+        2,
+        70,
+        8,
+        2,
+        1,
+        3,
+        1,
+        3,
         1,
         3,
         1,
@@ -149,6 +169,11 @@ def serializedATN():
         3,
         1,
         3,
+        3,
+        3,
+        78,
+        8,
+        3,
         1,
         4,
         1,
@@ -161,14 +186,14 @@ def serializedATN():
         6,
         4,
         6,
-        74,
+        85,
         8,
         6,
         11,
         6,
         12,
         6,
-        75,
+        86,
         1,
         7,
         1,
@@ -387,14 +412,14 @@ def serializedATN():
         23,
         5,
         23,
-        186,
+        197,
         8,
         23,
         10,
         23,
         12,
         23,
-        189,
+        200,
         9,
         23,
         1,
@@ -407,14 +432,14 @@ def serializedATN():
         24,
         5,
         24,
-        195,
+        206,
         8,
         24,
         10,
         24,
         12,
         24,
-        198,
+        209,
         9,
         24,
         1,
@@ -423,28 +448,28 @@ def serializedATN():
         25,
         5,
         25,
-        202,
+        213,
         8,
         25,
         10,
         25,
         12,
         25,
-        205,
+        216,
         9,
         25,
         1,
         26,
         4,
         26,
-        208,
+        219,
         8,
         26,
         11,
         26,
         12,
         26,
-        209,
+        220,
         1,
         26,
         1,
@@ -571,7 +596,7 @@ def serializedATN():
         13,
         32,
         32,
-        217,
+        231,
         0,
         1,
         1,
@@ -741,157 +766,157 @@ def serializedATN():
         0,
         0,
         3,
-        57,
+        63,
         1,
         0,
         0,
         0,
         5,
-        61,
+        69,
         1,
         0,
         0,
         0,
         7,
-        64,
+        77,
         1,
         0,
         0,
         0,
         9,
-        68,
+        79,
         1,
         0,
         0,
         0,
         11,
-        70,
+        81,
         1,
         0,
         0,
         0,
         13,
-        73,
+        84,
         1,
         0,
         0,
         0,
         15,
-        77,
+        88,
         1,
         0,
         0,
         0,
         17,
-        79,
+        90,
         1,
         0,
         0,
         0,
         19,
-        81,
+        92,
         1,
         0,
         0,
         0,
         21,
-        83,
+        94,
         1,
         0,
         0,
         0,
         23,
-        85,
+        96,
         1,
         0,
         0,
         0,
         25,
-        89,
+        100,
         1,
         0,
         0,
         0,
         27,
-        95,
+        106,
         1,
         0,
         0,
         0,
         29,
-        101,
+        112,
         1,
         0,
         0,
         0,
         31,
-        105,
+        116,
         1,
         0,
         0,
         0,
         33,
-        110,
+        121,
         1,
         0,
         0,
         0,
         35,
-        124,
+        135,
         1,
         0,
         0,
         0,
         37,
-        131,
+        142,
         1,
         0,
         0,
         0,
         39,
-        142,
+        153,
         1,
         0,
         0,
         0,
         41,
-        153,
+        164,
         1,
         0,
         0,
         0,
         43,
-        171,
+        182,
         1,
         0,
         0,
         0,
         45,
-        177,
+        188,
         1,
         0,
         0,
         0,
         47,
-        183,
+        194,
         1,
         0,
         0,
         0,
         49,
-        192,
+        203,
         1,
         0,
         0,
         0,
         51,
-        199,
+        210,
         1,
         0,
         0,
         0,
         53,
-        207,
+        218,
         1,
         0,
         0,
@@ -921,39 +946,45 @@ def serializedATN():
         0,
         0,
         59,
-        60,
+        64,
         5,
         100,
         0,
         0,
         60,
-        4,
-        1,
-        0,
+        61,
+        5,
+        65,
         0,
         0,
         61,
         62,
         5,
-        111,
+        78,
         0,
         0,
         62,
-        63,
+        64,
         5,
-        114,
+        68,
         0,
         0,
         63,
-        6,
+        57,
+        1,
+        0,
+        0,
+        0,
+        63,
+        60,
         1,
         0,
         0,
         0,
         64,
-        65,
-        5,
-        110,
+        4,
+        1,
+        0,
         0,
         0,
         65,
@@ -963,85 +994,91 @@ def serializedATN():
         0,
         0,
         66,
-        67,
+        70,
         5,
-        116,
+        114,
         0,
         0,
         67,
-        8,
-        1,
-        0,
+        68,
+        5,
+        79,
         0,
         0,
         68,
-        69,
+        70,
         5,
-        42,
+        82,
         0,
         0,
         69,
-        10,
+        65,
         1,
         0,
         0,
         0,
-        70,
-        71,
-        5,
-        43,
+        69,
+        67,
+        1,
         0,
         0,
-        71,
-        12,
+        0,
+        70,
+        6,
         1,
         0,
         0,
         0,
+        71,
         72,
-        74,
-        7,
-        0,
+        5,
+        110,
         0,
         0,
-        73,
         72,
-        1,
+        73,
+        5,
+        111,
         0,
         0,
+        73,
+        78,
+        5,
+        116,
+        0,
         0,
         74,
         75,
-        1,
-        0,
+        5,
+        78,
         0,
         0,
         75,
-        73,
-        1,
-        0,
+        76,
+        5,
+        79,
         0,
         0,
-        75,
         76,
-        1,
-        0,
+        78,
+        5,
+        84,
         0,
         0,
-        76,
-        14,
+        77,
+        71,
         1,
         0,
         0,
         0,
         77,
-        78,
-        5,
-        58,
+        74,
+        1,
+        0,
         0,
         0,
         78,
-        16,
+        8,
         1,
         0,
         0,
@@ -1049,11 +1086,11 @@ def serializedATN():
         79,
         80,
         5,
-        40,
+        42,
         0,
         0,
         80,
-        18,
+        10,
         1,
         0,
         0,
@@ -1061,271 +1098,277 @@ def serializedATN():
         81,
         82,
         5,
-        41,
+        43,
         0,
         0,
         82,
-        20,
+        12,
         1,
         0,
         0,
         0,
         83,
-        84,
-        5,
-        44,
+        85,
+        7,
+        0,
         0,
         0,
         84,
-        22,
+        83,
         1,
         0,
         0,
         0,
         85,
         86,
-        5,
-        107,
+        1,
+        0,
         0,
         0,
         86,
-        87,
-        5,
-        101,
+        84,
+        1,
         0,
         0,
+        0,
+        86,
         87,
-        88,
-        5,
-        121,
+        1,
         0,
         0,
-        88,
-        24,
+        0,
+        87,
+        14,
         1,
         0,
         0,
         0,
+        88,
         89,
-        90,
         5,
-        111,
+        58,
+        0,
+        0,
+        89,
+        16,
+        1,
+        0,
         0,
         0,
         90,
         91,
         5,
-        119,
+        40,
         0,
         0,
         91,
-        92,
-        5,
-        110,
+        18,
+        1,
+        0,
         0,
         0,
         92,
         93,
         5,
-        101,
+        41,
         0,
         0,
         93,
-        94,
-        5,
-        114,
+        20,
+        1,
         0,
         0,
-        94,
-        26,
-        1,
         0,
+        94,
+        95,
+        5,
+        44,
         0,
         0,
         95,
-        96,
-        5,
-        103,
+        22,
+        1,
+        0,
         0,
         0,
         96,
         97,
         5,
-        114,
+        107,
         0,
         0,
         97,
         98,
         5,
-        111,
+        101,
         0,
         0,
         98,
         99,
         5,
-        117,
+        121,
         0,
         0,
         99,
-        100,
-        5,
-        112,
+        24,
+        1,
         0,
         0,
-        100,
-        28,
-        1,
         0,
+        100,
+        101,
+        5,
+        111,
         0,
         0,
         101,
         102,
         5,
-        116,
+        119,
         0,
         0,
         102,
         103,
         5,
-        97,
+        110,
         0,
         0,
         103,
         104,
         5,
-        103,
+        101,
         0,
         0,
         104,
-        30,
-        1,
-        0,
+        105,
+        5,
+        114,
         0,
         0,
         105,
-        106,
-        5,
-        107,
+        26,
+        1,
+        0,
         0,
         0,
         106,
         107,
         5,
-        105,
+        103,
         0,
         0,
         107,
         108,
         5,
-        110,
+        114,
         0,
         0,
         108,
         109,
         5,
-        100,
+        111,
         0,
         0,
         109,
-        32,
-        1,
-        0,
+        110,
+        5,
+        117,
         0,
         0,
         110,
         111,
         5,
-        99,
+        112,
         0,
         0,
         111,
-        112,
-        5,
-        111,
+        28,
+        1,
+        0,
         0,
         0,
         112,
         113,
         5,
-        100,
+        116,
         0,
         0,
         113,
         114,
         5,
-        101,
+        97,
         0,
         0,
         114,
         115,
         5,
-        95,
+        103,
         0,
         0,
         115,
-        116,
-        5,
-        108,
+        30,
+        1,
+        0,
         0,
         0,
         116,
         117,
         5,
-        111,
+        107,
         0,
         0,
         117,
         118,
         5,
-        99,
+        105,
         0,
         0,
         118,
         119,
         5,
-        97,
+        110,
         0,
         0,
         119,
         120,
         5,
-        116,
+        100,
         0,
         0,
         120,
-        121,
-        5,
-        105,
+        32,
+        1,
+        0,
         0,
         0,
         121,
         122,
         5,
-        111,
+        99,
         0,
         0,
         122,
         123,
         5,
-        110,
+        111,
         0,
         0,
         123,
-        34,
-        1,
-        0,
+        124,
+        5,
+        100,
         0,
         0,
         124,
         125,
         5,
-        99,
+        101,
         0,
         0,
         125,
         126,
         5,
-        111,
+        95,
         0,
         0,
         126,
@@ -1337,73 +1380,73 @@ def serializedATN():
         127,
         128,
         5,
-        117,
+        111,
         0,
         0,
         128,
         129,
         5,
-        109,
+        99,
         0,
         0,
         129,
         130,
         5,
-        110,
+        97,
         0,
         0,
         130,
-        36,
-        1,
-        0,
+        131,
+        5,
+        116,
         0,
         0,
         131,
         132,
         5,
-        116,
+        105,
         0,
         0,
         132,
         133,
         5,
-        97,
+        111,
         0,
         0,
         133,
         134,
         5,
-        98,
+        110,
         0,
         0,
         134,
-        135,
-        5,
-        108,
+        34,
+        1,
+        0,
         0,
         0,
         135,
         136,
         5,
-        101,
+        99,
         0,
         0,
         136,
         137,
         5,
-        95,
+        111,
         0,
         0,
         137,
         138,
         5,
-        110,
+        108,
         0,
         0,
         138,
         139,
         5,
-        97,
+        117,
         0,
         0,
         139,
@@ -1415,11 +1458,11 @@ def serializedATN():
         140,
         141,
         5,
-        101,
+        110,
         0,
         0,
         141,
-        38,
+        36,
         1,
         0,
         0,
@@ -1427,65 +1470,65 @@ def serializedATN():
         142,
         143,
         5,
-        99,
+        116,
         0,
         0,
         143,
         144,
         5,
-        111,
+        97,
         0,
         0,
         144,
         145,
         5,
-        108,
+        98,
         0,
         0,
         145,
         146,
         5,
-        117,
+        108,
         0,
         0,
         146,
         147,
         5,
-        109,
+        101,
         0,
         0,
         147,
         148,
         5,
-        110,
+        95,
         0,
         0,
         148,
         149,
         5,
-        95,
+        110,
         0,
         0,
         149,
         150,
         5,
-        116,
+        97,
         0,
         0,
         150,
         151,
         5,
-        97,
+        109,
         0,
         0,
         151,
         152,
         5,
-        103,
+        101,
         0,
         0,
         152,
-        40,
+        38,
         1,
         0,
         0,
@@ -1499,73 +1542,73 @@ def serializedATN():
         154,
         155,
         5,
-        104,
+        111,
         0,
         0,
         155,
         156,
         5,
-        97,
+        108,
         0,
         0,
         156,
         157,
         5,
-        110,
+        117,
         0,
         0,
         157,
         158,
         5,
-        103,
+        109,
         0,
         0,
         158,
         159,
         5,
-        101,
+        110,
         0,
         0,
         159,
         160,
         5,
-        100,
+        95,
         0,
         0,
         160,
         161,
         5,
-        95,
+        116,
         0,
         0,
         161,
         162,
         5,
-        105,
+        97,
         0,
         0,
         162,
         163,
         5,
-        110,
+        103,
         0,
         0,
         163,
-        164,
-        5,
-        95,
+        40,
+        1,
+        0,
         0,
         0,
         164,
         165,
         5,
-        98,
+        99,
         0,
         0,
         165,
         166,
         5,
-        114,
+        104,
         0,
         0,
         166,
@@ -1583,25 +1626,25 @@ def serializedATN():
         168,
         169,
         5,
-        99,
+        103,
         0,
         0,
         169,
         170,
         5,
-        104,
+        101,
         0,
         0,
         170,
-        42,
-        1,
-        0,
+        171,
+        5,
+        100,
         0,
         0,
         171,
         172,
         5,
-        115,
+        95,
         0,
         0,
         172,
@@ -1619,268 +1662,337 @@ def serializedATN():
         174,
         175,
         5,
-        107,
+        95,
         0,
         0,
         175,
         176,
         5,
-        115,
+        98,
         0,
         0,
         176,
-        44,
-        1,
-        0,
+        177,
+        5,
+        114,
         0,
         0,
         177,
         178,
         5,
-        114,
+        97,
         0,
         0,
         178,
         179,
         5,
-        111,
+        110,
         0,
         0,
         179,
         180,
         5,
-        111,
+        99,
         0,
         0,
         180,
         181,
         5,
-        116,
+        104,
         0,
         0,
         181,
+        42,
+        1,
+        0,
+        0,
+        0,
         182,
+        183,
         5,
         115,
         0,
         0,
-        182,
+        183,
+        184,
+        5,
+        105,
+        0,
+        0,
+        184,
+        185,
+        5,
+        110,
+        0,
+        0,
+        185,
+        186,
+        5,
+        107,
+        0,
+        0,
+        186,
+        187,
+        5,
+        115,
+        0,
+        0,
+        187,
+        44,
+        1,
+        0,
+        0,
+        0,
+        188,
+        189,
+        5,
+        114,
+        0,
+        0,
+        189,
+        190,
+        5,
+        111,
+        0,
+        0,
+        190,
+        191,
+        5,
+        111,
+        0,
+        0,
+        191,
+        192,
+        5,
+        116,
+        0,
+        0,
+        192,
+        193,
+        5,
+        115,
+        0,
+        0,
+        193,
         46,
         1,
         0,
         0,
         0,
-        183,
-        187,
+        194,
+        198,
         5,
         34,
         0,
         0,
-        184,
-        186,
+        195,
+        197,
         8,
         1,
         0,
         0,
-        185,
-        184,
+        196,
+        195,
         1,
         0,
         0,
         0,
-        186,
-        189,
+        197,
+        200,
         1,
         0,
         0,
         0,
-        187,
-        185,
+        198,
+        196,
         1,
         0,
         0,
         0,
-        187,
-        188,
+        198,
+        199,
         1,
         0,
         0,
         0,
-        188,
-        190,
+        199,
+        201,
         1,
         0,
         0,
         0,
-        189,
-        187,
+        200,
+        198,
         1,
         0,
         0,
         0,
-        190,
-        191,
+        201,
+        202,
         5,
         34,
         0,
         0,
-        191,
+        202,
         48,
         1,
         0,
         0,
         0,
-        192,
-        196,
+        203,
+        207,
         7,
         2,
         0,
         0,
-        193,
-        195,
+        204,
+        206,
         7,
         3,
         0,
         0,
-        194,
-        193,
+        205,
+        204,
         1,
         0,
         0,
         0,
-        195,
-        198,
+        206,
+        209,
         1,
         0,
         0,
         0,
-        196,
-        194,
+        207,
+        205,
         1,
         0,
         0,
         0,
-        196,
-        197,
+        207,
+        208,
         1,
         0,
         0,
         0,
-        197,
+        208,
         50,
         1,
         0,
         0,
         0,
-        198,
-        196,
+        209,
+        207,
         1,
         0,
         0,
         0,
-        199,
-        203,
+        210,
+        214,
         7,
         4,
         0,
         0,
-        200,
-        202,
+        211,
+        213,
         7,
         5,
         0,
         0,
-        201,
-        200,
+        212,
+        211,
         1,
         0,
         0,
         0,
-        202,
-        205,
+        213,
+        216,
         1,
         0,
         0,
         0,
-        203,
-        201,
+        214,
+        212,
         1,
         0,
         0,
         0,
-        203,
-        204,
+        214,
+        215,
         1,
         0,
         0,
         0,
-        204,
+        215,
         52,
         1,
         0,
         0,
         0,
-        205,
-        203,
+        216,
+        214,
         1,
         0,
         0,
         0,
-        206,
-        208,
+        217,
+        219,
         7,
         6,
         0,
         0,
-        207,
-        206,
+        218,
+        217,
         1,
         0,
         0,
         0,
-        208,
-        209,
+        219,
+        220,
         1,
         0,
         0,
         0,
-        209,
-        207,
+        220,
+        218,
         1,
         0,
         0,
         0,
-        209,
-        210,
+        220,
+        221,
         1,
         0,
         0,
         0,
-        210,
-        211,
+        221,
+        222,
         1,
         0,
         0,
         0,
-        211,
-        212,
+        222,
+        223,
         6,
         26,
         0,
         0,
-        212,
+        223,
         54,
         1,
         0,
         0,
         0,
-        6,
+        9,
         0,
-        75,
-        187,
-        196,
-        203,
-        209,
+        63,
+        69,
+        77,
+        86,
+        198,
+        207,
+        214,
+        220,
         1,
         6,
         0,
@@ -1928,9 +2040,6 @@ class AssetSelectionLexer(Lexer):
     literalNames = [
         "<INVALID>",
         "'='",
-        "'and'",
-        "'or'",
-        "'not'",
         "'*'",
         "'+'",
         "':'",
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.tokens b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.tokens
index 373465d0bd09c..5ce47397a8001 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.tokens
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionLexer.tokens
@@ -26,9 +26,6 @@ UNQUOTED_STRING=25
 UNQUOTED_WILDCARD_STRING=26
 WS=27
 '='=1
-'and'=2
-'or'=3
-'not'=4
 '*'=5
 '+'=6
 ':'=8
diff --git a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionParser.py b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionParser.py
index 2185eda671a99..f8b316d00f1db 100644
--- a/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionParser.py
+++ b/python_modules/dagster/dagster/_core/definitions/antlr_asset_selection/generated/AssetSelectionParser.py
@@ -1084,9 +1084,9 @@ class AssetSelectionParser(Parser):
     literalNames = [
         "<INVALID>",
         "'='",
-        "'and'",
-        "'or'",
-        "'not'",
+        "<INVALID>",
+        "<INVALID>",
+        "<INVALID>",
         "'*'",
         "'+'",
         "<INVALID>",
diff --git a/python_modules/dagster/dagster_tests/asset_defs_tests/test_antlr_asset_selection.py b/python_modules/dagster/dagster_tests/asset_defs_tests/test_antlr_asset_selection.py
index 3e0b3ced0847a..6cd70bffcd722 100644
--- a/python_modules/dagster/dagster_tests/asset_defs_tests/test_antlr_asset_selection.py
+++ b/python_modules/dagster/dagster_tests/asset_defs_tests/test_antlr_asset_selection.py
@@ -121,16 +121,31 @@ def test_antlr_tree_invalid(selection_str):
             AssetSelection.all(include_sources=True)
             - KeyWildCardAssetSelection(selected_key_wildcard="a"),
         ),
+        (
+            "NOT key:a",
+            AssetSelection.all(include_sources=True)
+            - KeyWildCardAssetSelection(selected_key_wildcard="a"),
+        ),
         (
             "key:a and key:b",
             KeyWildCardAssetSelection(selected_key_wildcard="a")
             & KeyWildCardAssetSelection(selected_key_wildcard="b"),
         ),
+        (
+            "key:a AND key:b",
+            KeyWildCardAssetSelection(selected_key_wildcard="a")
+            & KeyWildCardAssetSelection(selected_key_wildcard="b"),
+        ),
         (
             "key:a or key:b",
             KeyWildCardAssetSelection(selected_key_wildcard="a")
             | KeyWildCardAssetSelection(selected_key_wildcard="b"),
         ),
+        (
+            "key:a OR key:b",
+            KeyWildCardAssetSelection(selected_key_wildcard="a")
+            | KeyWildCardAssetSelection(selected_key_wildcard="b"),
+        ),
         ("1+key:a", KeyWildCardAssetSelection(selected_key_wildcard="a").upstream(1)),
         ("2+key:a", KeyWildCardAssetSelection(selected_key_wildcard="a").upstream(2)),
         ("key:a+1", KeyWildCardAssetSelection(selected_key_wildcard="a").downstream(1)),