diff --git a/server/compose/page.cue b/server/compose/page.cue
index a5628ead8..4266a514c 100644
--- a/server/compose/page.cue
+++ b/server/compose/page.cue
@@ -59,7 +59,7 @@ page: {
 			}
 
 			meta: {
-				goType: "*types.PageMeta"
+				goType: "types.PageMeta"
 				dal: { type: "JSON", defaultEmptyObject: true }
 				omitSetter: true
 				omitGetter: true
diff --git a/server/compose/page_layout.cue b/server/compose/page_layout.cue
index 7f818a3f7..0889bd382 100644
--- a/server/compose/page_layout.cue
+++ b/server/compose/page_layout.cue
@@ -40,7 +40,7 @@ pageLayout: {
 			}
 
 			meta: {
-				goType: "*types.PageLayoutMeta"
+				goType: "types.PageLayoutMeta"
 				dal: { type: "JSON", defaultEmptyObject: true }
 				omitSetter: true
 				omitGetter: true
diff --git a/server/compose/rest.yaml b/server/compose/rest.yaml
index 6affe957d..fd693dc78 100644
--- a/server/compose/rest.yaml
+++ b/server/compose/rest.yaml
@@ -345,7 +345,7 @@ endpoints:
         name: config
         required: false
         title: Config JSON
-      - type: "*types.PageMeta"
+      - type: "types.PageMeta"
         name: meta
         required: false
         title: Meta
@@ -416,7 +416,7 @@ endpoints:
         name: config
         required: false
         title: Config JSON
-      - type: "*types.PageMeta"
+      - type: "types.PageMeta"
         name: meta
         required: false
         title: Meta
@@ -696,7 +696,7 @@ endpoints:
         name: primary
         required: false
         title: Primary
-      - type: "*types.PageLayoutMeta"
+      - type: "types.PageLayoutMeta"
         name: meta
         required: false
         title: Meta
@@ -767,7 +767,7 @@ endpoints:
         name: primary
         required: false
         title: Primary
-      - type: "*types.PageLayoutMeta"
+      - type: "types.PageLayoutMeta"
         name: meta
         required: false
         title: Meta
diff --git a/server/compose/rest/request/page.go b/server/compose/rest/request/page.go
index 63951e4f7..0e19c78f0 100644
--- a/server/compose/rest/request/page.go
+++ b/server/compose/rest/request/page.go
@@ -144,7 +144,7 @@ type (
 		// Meta POST parameter
 		//
 		// Meta
-		Meta *types.PageMeta
+		Meta types.PageMeta
 	}
 
 	PageRead struct {
@@ -230,7 +230,7 @@ type (
 		// Meta POST parameter
 		//
 		// Meta
-		Meta *types.PageMeta
+		Meta types.PageMeta
 	}
 
 	PageReorder struct {
@@ -584,7 +584,7 @@ func (r PageCreate) GetConfig() sqlxTypes.JSONText {
 }
 
 // Auditable returns all auditable/loggable parameters
-func (r PageCreate) GetMeta() *types.PageMeta {
+func (r PageCreate) GetMeta() types.PageMeta {
 	return r.Meta
 }
 
@@ -975,7 +975,7 @@ func (r PageUpdate) GetConfig() sqlxTypes.JSONText {
 }
 
 // Auditable returns all auditable/loggable parameters
-func (r PageUpdate) GetMeta() *types.PageMeta {
+func (r PageUpdate) GetMeta() types.PageMeta {
 	return r.Meta
 }
 
diff --git a/server/compose/rest/request/pageLayout.go b/server/compose/rest/request/pageLayout.go
index 495f5d909..bdc3e5d6d 100644
--- a/server/compose/rest/request/pageLayout.go
+++ b/server/compose/rest/request/pageLayout.go
@@ -190,7 +190,7 @@ type (
 		// Meta POST parameter
 		//
 		// Meta
-		Meta *types.PageLayoutMeta
+		Meta types.PageLayoutMeta
 
 		// Config POST parameter
 		//
@@ -274,7 +274,7 @@ type (
 		// Meta POST parameter
 		//
 		// Meta
-		Meta *types.PageLayoutMeta
+		Meta types.PageLayoutMeta
 
 		// Config POST parameter
 		//
@@ -784,7 +784,7 @@ func (r PageLayoutCreate) GetPrimary() bool {
 }
 
 // Auditable returns all auditable/loggable parameters
-func (r PageLayoutCreate) GetMeta() *types.PageLayoutMeta {
+func (r PageLayoutCreate) GetMeta() types.PageLayoutMeta {
 	return r.Meta
 }
 
@@ -1144,7 +1144,7 @@ func (r PageLayoutUpdate) GetPrimary() bool {
 }
 
 // Auditable returns all auditable/loggable parameters
-func (r PageLayoutUpdate) GetMeta() *types.PageLayoutMeta {
+func (r PageLayoutUpdate) GetMeta() types.PageLayoutMeta {
 	return r.Meta
 }
 
diff --git a/server/compose/service/page.go b/server/compose/service/page.go
index 55982fcac..e03fae5e4 100644
--- a/server/compose/service/page.go
+++ b/server/compose/service/page.go
@@ -627,14 +627,9 @@ func (svc page) handleUpdate(ctx context.Context, upd *types.Page) pageUpdateHan
 			}
 		}
 
-		if upd.Meta != nil {
-			if res.Meta.AllowPersonalLayouts != upd.Meta.AllowPersonalLayouts {
-				if res.Meta == nil {
-					res.Meta = &types.PageMeta{}
-					res.Meta.AllowPersonalLayouts = upd.Meta.AllowPersonalLayouts
-					changes |= pageChanged
-				}
-			}
+		if res.Meta.AllowPersonalLayouts != upd.Meta.AllowPersonalLayouts {
+			res.Meta.AllowPersonalLayouts = upd.Meta.AllowPersonalLayouts
+			changes |= pageChanged
 		}
 
 		if res.Title != upd.Title {
diff --git a/server/compose/service/page_layout.go b/server/compose/service/page_layout.go
index 7c6d83190..0a7c556ad 100644
--- a/server/compose/service/page_layout.go
+++ b/server/compose/service/page_layout.go
@@ -504,7 +504,7 @@ func (svc pageLayout) handleUpdate(ctx context.Context, upd *types.PageLayout) p
 			}
 		}
 
-		if res.Meta != nil && res.Meta.Title != upd.Meta.Title {
+		if res.Meta.Title != upd.Meta.Title {
 			res.Meta.Title = upd.Meta.Title
 			changes |= pageLayoutChanged
 		}
@@ -514,7 +514,7 @@ func (svc pageLayout) handleUpdate(ctx context.Context, upd *types.PageLayout) p
 			changes |= pageLayoutChanged
 		}
 
-		if res.Meta != nil && res.Meta.Description != upd.Meta.Description {
+		if res.Meta.Description != upd.Meta.Description {
 			res.Meta.Description = upd.Meta.Description
 			changes |= pageLayoutChanged
 		}
diff --git a/server/compose/types/page.go b/server/compose/types/page.go
index 8ada6d26a..f7774bf2e 100644
--- a/server/compose/types/page.go
+++ b/server/compose/types/page.go
@@ -29,7 +29,7 @@ type (
 		Config PageConfig `json:"config"`
 		Blocks PageBlocks `json:"blocks"`
 
-		Meta *PageMeta `json:"meta"`
+		Meta PageMeta `json:"meta"`
 
 		Children PageSet `json:"children,omitempty"`
 
diff --git a/server/compose/types/page_layout.go b/server/compose/types/page_layout.go
index 1557e49fb..cb6195fda 100644
--- a/server/compose/types/page_layout.go
+++ b/server/compose/types/page_layout.go
@@ -24,7 +24,7 @@ type (
 
 		Weight int `json:"weight"`
 
-		Meta *PageLayoutMeta `json:"meta"`
+		Meta PageLayoutMeta `json:"meta"`
 
 		Config PageLayoutConfig `json:"config"`
 		Blocks PageBlocks       `json:"blocks"`
@@ -82,12 +82,14 @@ type (
 	}
 
 	PageLayoutFilter struct {
-		NamespaceID uint64 `json:"namespaceID,string"`
-		PageID      uint64 `json:"pageID,string,omitempty"`
-		Primary     bool   `json:"primary,omitempty"`
-		Handle      string `json:"handle"`
-		Name        string `json:"name"`
-		Query       string `json:"query"`
+		PageLayoutID []uint64 `json:"pageLayoutID,string"`
+		NamespaceID  uint64   `json:"namespaceID,string"`
+		PageID       uint64   `json:"pageID,string,omitempty"`
+		ParentID     uint64   `json:"ParentID,string,omitempty"`
+		Primary      bool     `json:"primary,omitempty"`
+		Handle       string   `json:"handle"`
+		Name         string   `json:"name"`
+		Query        string   `json:"query"`
 
 		LabeledIDs []uint64          `json:"-"`
 		Labels     map[string]string `json:"labels,omitempty"`
@@ -161,8 +163,8 @@ func (set PageLayoutSet) FindByHandle(handle string) *PageLayout {
 	return nil
 }
 
-func (bb *PageLayoutConfig) Scan(src any) error          { return sql.ParseJSON(src, bb) }
+func (bb *PageLayoutConfig) Scan(src any) error          { return sql.ParseJSON(src, &bb) }
 func (bb PageLayoutConfig) Value() (driver.Value, error) { return json.Marshal(bb) }
 
-func (vv *PageLayoutMeta) Scan(src any) error           { return sql.ParseJSON(src, vv) }
-func (vv *PageLayoutMeta) Value() (driver.Value, error) { return json.Marshal(vv) }
+func (vv *PageLayoutMeta) Scan(src any) error          { return sql.ParseJSON(src, &vv) }
+func (vv PageLayoutMeta) Value() (driver.Value, error) { return json.Marshal(vv) }
diff --git a/server/compose/types/parsers.go b/server/compose/types/parsers.go
index 98c9fabec..97e62dab7 100644
--- a/server/compose/types/parsers.go
+++ b/server/compose/types/parsers.go
@@ -2,13 +2,13 @@ package types
 
 import "encoding/json"
 
-func ParsePageLayoutMeta(ss []string) (p *PageLayoutMeta, err error) {
-	p = &PageLayoutMeta{}
+func ParsePageLayoutMeta(ss []string) (p PageLayoutMeta, err error) {
+	p = PageLayoutMeta{}
 	return p, parseStringsInput(ss, &p)
 }
 
-func ParsePageMeta(ss []string) (p *PageMeta, err error) {
-	p = &PageMeta{}
+func ParsePageMeta(ss []string) (p PageMeta, err error) {
+	p = PageMeta{}
 	return p, parseStringsInput(ss, &p)
 }
 
diff --git a/server/store/adapters/rdbms/aux_types.gen.go b/server/store/adapters/rdbms/aux_types.gen.go
index 73e880d32..48e6604c1 100644
--- a/server/store/adapters/rdbms/aux_types.gen.go
+++ b/server/store/adapters/rdbms/aux_types.gen.go
@@ -293,7 +293,7 @@ type (
 		SelfID      uint64                 `db:"self_id"`
 		ModuleID    uint64                 `db:"module_id"`
 		NamespaceID uint64                 `db:"namespace_id"`
-		Meta        *composeType.PageMeta  `db:"meta"`
+		Meta        composeType.PageMeta   `db:"meta"`
 		Config      composeType.PageConfig `db:"config"`
 		Blocks      composeType.PageBlocks `db:"blocks"`
 		Visible     bool                   `db:"visible"`
@@ -312,7 +312,7 @@ type (
 		ParentID    uint64                       `db:"parent_id"`
 		NamespaceID uint64                       `db:"namespace_id"`
 		Weight      int                          `db:"weight"`
-		Meta        *composeType.PageLayoutMeta  `db:"meta"`
+		Meta        composeType.PageLayoutMeta   `db:"meta"`
 		Primary     bool                         `db:"primary"`
 		Config      composeType.PageLayoutConfig `db:"config"`
 		Blocks      composeType.PageBlocks       `db:"blocks"`
diff --git a/server/tests/compose/page_layout_test.go b/server/tests/compose/page_layout_test.go
index 405ebc1a4..d8ef0fcf5 100644
--- a/server/tests/compose/page_layout_test.go
+++ b/server/tests/compose/page_layout_test.go
@@ -24,7 +24,7 @@ func (h helper) repoMakePageLayout(ns *types.Namespace, pg *types.Page, title st
 	res := &types.PageLayout{
 		ID:        id.Next(),
 		CreatedAt: time.Now(),
-		Meta: &types.PageLayoutMeta{
+		Meta: types.PageLayoutMeta{
 			Title: title,
 		},
 		NamespaceID: ns.ID,