diff --git a/bql/semantic/hooks.go b/bql/semantic/hooks.go
index 16eec07d..8e31008e 100644
--- a/bql/semantic/hooks.go
+++ b/bql/semantic/hooks.go
@@ -470,7 +470,7 @@ func processPredicateBound(ce ConsumedElement) (string, string, string, *time.Ti
 	id, tl, tu := cmps[0][1], cmps[0][2], cmps[0][3]
 	pID = id
 	// Lower bound processing.
-	if strings.Index(tl, "?") != -1 {
+	if strings.Contains(tl, "?") {
 		pLowerBoundAlias = tl
 	} else {
 		stl := strings.TrimSpace(tl)
@@ -483,7 +483,7 @@ func processPredicateBound(ce ConsumedElement) (string, string, string, *time.Ti
 		}
 	}
 	// Lower bound processing.
-	if strings.Index(tu, "?") != -1 {
+	if strings.Contains(tu, "?") {
 		pUpperBoundAlias = tu
 	} else {
 		stu := strings.TrimSpace(tu)
diff --git a/bql/table/table_test.go b/bql/table/table_test.go
index 103bf18a..7063a8fc 100644
--- a/bql/table/table_test.go
+++ b/bql/table/table_test.go
@@ -1347,21 +1347,21 @@ func TestFilter(t *testing.T) {
 		{
 			t: table(),
 			f: func(r Row) bool {
-				return strings.Index(r["?s"].String(), "1s") != -1
+				return strings.Contains(r["?s"].String(), "1s") 
 			},
 			want: 2,
 		},
 		{
 			t: table(),
 			f: func(r Row) bool {
-				return strings.Index(r["?s"].String(), "t") != -1
+				return strings.Contains(r["?s"].String(), "t") 
 			},
 			want: 3,
 		},
 		{
 			t: table(),
 			f: func(r Row) bool {
-				return strings.Index(r["?t"].String(), "t") != -1
+				return strings.Contains(r["?t"].String(), "t") 
 			},
 			want: 0,
 		},