diff --git a/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go b/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
index 8ca5474ad5aaf3f367f9d17f5c27aebe197c9a54..e307f92b518cd4ecec77462c7c8908e8947a6ce8 100644
--- a/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
+++ b/go-apps/meep-app-enablement/server/capif-mgmt/service-mgmt.go
@@ -1243,7 +1243,12 @@ func getServices(w http.ResponseWriter, r *http.Request, appId string) {
 			return
 		}
 		consumedLocalOnly, err = strconv.ParseBool(parsedParam.Value)
-		consumedLocalOnlyPresent = err == nil
+		consumedLocalOnlyPresent = true
+		if err != nil {
+			consumedLocalOnly = false
+			consumedLocalOnlyPresent = false
+		}
+
 	}
 
 	isLocalParam := q.Get("vend-spec-etsi-mec-is-local")
@@ -1256,7 +1261,11 @@ func getServices(w http.ResponseWriter, r *http.Request, appId string) {
 			return
 		}
 		isLocal, err = strconv.ParseBool(parsedParam.Value)
-		isLocalPresent = err == nil
+		isLocalPresent = true
+		if err != nil {
+			isLocal = false
+			isLocalPresent = false
+		}
 	}
 
 	scopeOfLocalityParam := q.Get("vend-spec-etsi-mec-scope-of-locality")
diff --git a/go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go b/go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go
index 80fc6787c4aef9ca81e03becca448867e2067cd0..63ea3ab6fd4c476b04dfc3898ac140856476ad29 100644
--- a/go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go
+++ b/go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go
@@ -1182,12 +1182,12 @@ func getServices(w http.ResponseWriter, r *http.Request, appId string) {
 	// Validate query parameters
 	u, _ := url.Parse(r.URL.String())
 	q := u.Query()
-	// validParams := []string{"ser_instance_id", "ser_name", "ser_category_id", "consumed_local_only", "is_local", "scope_of_locality"}
-	// err := validateQueryParams(q, validParams)
-	// if err != nil {
-	// 	errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
-	// 	return
-	// }
+	validParams := []string{"ser_instance_id", "ser_name", "ser_category_id", "consumed_local_only", "is_local", "scope_of_locality"}
+	err := validateQueryParams(q, validParams)
+	if err != nil {
+		errHandlerProblemDetails(w, err.Error(), http.StatusBadRequest)
+		return
+	}
 
 	serInstanceId := q["ser_instance_id"]
 	serName := q["ser_name"]