diff --git a/server/pkg/dal/runner_gval.go b/server/pkg/dal/runner_gval.go
index b3e9118a7..683dff7de 100644
--- a/server/pkg/dal/runner_gval.go
+++ b/server/pkg/dal/runner_gval.go
@@ -94,7 +94,7 @@ var (
 			OutType: &TypeBoolean{},
 		},
 		"ge": {
-			//Handler: makeGenericCompHandler(">="),
+			// Handler: makeGenericCompHandler(">="),
 			Handler: func(args ...string) string {
 				return fmt.Sprintf("%s >= %s", args[0], args[1])
 			},
@@ -213,6 +213,12 @@ var (
 			},
 			OutType: &TypeNumber{},
 		},
+		"week": {
+			Handler: func(args ...string) string {
+				return fmt.Sprintf("week(%s)", args[0])
+			},
+			OutType: &TypeNumber{},
+		},
 		"date_format": {
 			Handler: func(args ...string) string {
 				return fmt.Sprintf("strftime(%s, %s)", args[0], args[1])
diff --git a/server/store/adapters/rdbms/drivers/postgres/ql.go b/server/store/adapters/rdbms/drivers/postgres/ql.go
index cb194506f..b27ee14fd 100644
--- a/server/store/adapters/rdbms/drivers/postgres/ql.go
+++ b/server/store/adapters/rdbms/drivers/postgres/ql.go
@@ -68,9 +68,8 @@ var (
 		},
 		"week": {
 			Handler: func(args ...exp.Expression) exp.Expression {
-				return exp.NewSQLFunctionExpression("TO_CHAR",
-					exp.NewLiteralExpression("?::TIMESTAMPTZ", args[0]),
-					exp.NewLiteralExpression("?", "IW"),
+				return exp.NewSQLFunctionExpression("EXTRACT",
+					exp.NewLiteralExpression("WEEK FROM ?", args[0]),
 				)
 			},
 		},