diff --git a/apiserver/graph/schema/modelservice.gql b/apiserver/graph/schema/modelservice.gql
index 2e3b3a868..dbfb314a8 100644
--- a/apiserver/graph/schema/modelservice.gql
+++ b/apiserver/graph/schema/modelservice.gql
@@ -12,7 +12,8 @@ mutation createModelService($input: CreateModelServiceInput!) {
             providerType
             types
             apiType
-            models
+            llmModels
+            embeddingModels
             creationTimestamp
             updateTimestamp
             status
@@ -36,7 +37,8 @@ mutation updateModelService($input: UpdateModelServiceInput) {
             providerType
             types
             apiType
-            models
+            llmModels
+            embeddingModels
             creationTimestamp
             updateTimestamp
             status
@@ -66,7 +68,8 @@ query getModelService($name: String!, $namespace: String!) {
             providerType
             types
             apiType
-            models
+            llmModels
+            embeddingModels
             creationTimestamp
             updateTimestamp
             status
@@ -95,7 +98,8 @@ query listModelServices($input: ListModelServiceInput) {
                     providerType
                     types
                     apiType
-                    models
+                    llmModels
+                    embeddingModels
                     creationTimestamp
                     updateTimestamp
                     status
diff --git a/apiserver/pkg/embedder/embedder.go b/apiserver/pkg/embedder/embedder.go
index f9b90209a..0e9fdadeb 100644
--- a/apiserver/pkg/embedder/embedder.go
+++ b/apiserver/pkg/embedder/embedder.go
@@ -243,7 +243,7 @@ func ListEmbedders(ctx context.Context, c dynamic.Interface, input generated.Lis
 	if input.Page != nil && *input.Page > 0 {
 		page = *input.Page
 	}
-	if input.PageSize != nil && *input.PageSize > 0 {
+	if input.PageSize != nil {
 		pageSize = *input.PageSize
 	}
 
diff --git a/apiserver/pkg/llm/llm.go b/apiserver/pkg/llm/llm.go
index be3924158..7cd8bab61 100644
--- a/apiserver/pkg/llm/llm.go
+++ b/apiserver/pkg/llm/llm.go
@@ -117,7 +117,7 @@ func ListLLMs(ctx context.Context, c dynamic.Interface, input generated.ListComm
 	if input.Page != nil && *input.Page > 0 {
 		page = *input.Page
 	}
-	if input.PageSize != nil && *input.PageSize > 0 {
+	if input.PageSize != nil {
 		pageSize = *input.PageSize
 	}
 
diff --git a/apiserver/pkg/worker/worker.go b/apiserver/pkg/worker/worker.go
index 6a64041e6..f1a952719 100644
--- a/apiserver/pkg/worker/worker.go
+++ b/apiserver/pkg/worker/worker.go
@@ -327,7 +327,7 @@ func ListWorkers(ctx context.Context, c dynamic.Interface, input generated.ListW
 	if input.Page != nil && *input.Page > 0 {
 		page = *input.Page
 	}
-	if input.PageSize != nil && *input.PageSize > 0 {
+	if input.PageSize != nil {
 		pageSize = *input.PageSize
 	}