diff --git a/pkg/models/kanban.go b/pkg/models/kanban.go
index 9be2dba2d..826824abe 100644
--- a/pkg/models/kanban.go
+++ b/pkg/models/kanban.go
@@ -226,9 +226,9 @@ func GetTasksInBucketsForView(s *xorm.Session, view *ProjectView, projects []*Pr
 	originalFilter := opts.filter
 	for id, bucket := range bucketMap {
 
-		if !strings.Contains(originalFilter, "bucket_id") {
+		if !strings.Contains(originalFilter, taskPropertyBucketID) {
 
-			var bucketFilter = "bucket_id = " + strconv.FormatInt(id, 10)
+			var bucketFilter = taskPropertyBucketID + " = " + strconv.FormatInt(id, 10)
 			if view.BucketConfigurationMode == BucketConfigurationModeFilter {
 				bucketFilter = "(" + view.BucketConfiguration[id].Filter + ")"
 			}
diff --git a/pkg/models/task_collection.go b/pkg/models/task_collection.go
index 3dd693e6d..6830f7276 100644
--- a/pkg/models/task_collection.go
+++ b/pkg/models/task_collection.go
@@ -142,7 +142,7 @@ func getTaskOrTasksInBuckets(s *xorm.Session, a web.Auth, projects []*Project, v
 		return getTasksForProjects(s, projects, a, opts, view)
 	}
 
-	if view != nil && !strings.Contains(opts.filter, "bucket_id") {
+	if view != nil && !strings.Contains(opts.filter, taskPropertyBucketID) {
 		if view.BucketConfigurationMode != BucketConfigurationModeNone {
 			tasksInBuckets, err := GetTasksInBucketsForView(s, view, projects, opts, a)
 			return tasksInBuckets, len(tasksInBuckets), int64(len(tasksInBuckets)), err
@@ -285,7 +285,7 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
 			}
 		}
 
-		if strings.Contains(tf.Filter, "bucket_id") {
+		if strings.Contains(tf.Filter, taskPropertyBucketID) {
 			filteringForBucket = true
 			if view.BucketConfigurationMode == BucketConfigurationModeFilter {
 				tf.Filter, err = getFilterValueForBucketFilter(tf.Filter, view)
diff --git a/pkg/models/task_search.go b/pkg/models/task_search.go
index 9eccca8a8..fd244d8e3 100644
--- a/pkg/models/task_search.go
+++ b/pkg/models/task_search.go
@@ -460,7 +460,7 @@ func convertParsedFilterToTypesense(rawFilters []*taskFilter) (filterBy string,
 			f.field = "project_id"
 		}
 
-		if f.field == "bucket_id" {
+		if f.field == taskPropertyBucketID {
 			f.field = "buckets"
 		}