diff --git a/pkg/assembler/graphql/examples/certify_good.gql b/pkg/assembler/graphql/examples/certify_good.gql
index b30449d2d5..02cc752b08 100644
--- a/pkg/assembler/graphql/examples/certify_good.gql
+++ b/pkg/assembler/graphql/examples/certify_good.gql
@@ -90,6 +90,7 @@ query CertifactGoodQ6 {
 mutation CertifyGoodM1 {
   ingestCertifyGood(
     subject: {artifact: {algorithm: "md5", digest: "2b00042f7481c7b056c4b410d28f33cf"}},
+    pkgMatchType: {pkg: ALL_VERSIONS}
     certifyGood: {
       justification: "why",
       origin: "testing backend",
@@ -103,6 +104,7 @@ mutation CertifyGoodM1 {
 mutation CertifyGoodM2 {
   ingestCertifyGood(
     subject: {artifact: {algorithm: "md5", digest: "0ABCDEF0FEDCBA01234567890ABCDEF0"}},
+    pkgMatchType: {pkg: ALL_VERSIONS}
     certifyGood: {
       justification: "why2",
       origin: "testing backend",
diff --git a/pkg/assembler/graphql/examples/ui_opts.gql b/pkg/assembler/graphql/examples/ui_opts.gql
index b8822a317f..2599d47309 100644
--- a/pkg/assembler/graphql/examples/ui_opts.gql
+++ b/pkg/assembler/graphql/examples/ui_opts.gql
@@ -1,4 +1,4 @@
-query GetPkg ($spec: PkgSpec) {
+query GetPkg ($spec: PkgSpec!) {
   packages(pkgSpec: $spec){
     ...allPkgTree
   }
@@ -10,7 +10,7 @@ query GetPkgTypes {
   }
 }
 
-query GetPkgNamespaces ($spec : PkgSpec) {
+query GetPkgNamespaces ($spec : PkgSpec!) {
   packages(pkgSpec: $spec){
     type
     namespaces {
@@ -20,7 +20,7 @@ query GetPkgNamespaces ($spec : PkgSpec) {
 }
 
 
-query GetPkgNames ($spec : PkgSpec) {
+query GetPkgNames ($spec : PkgSpec!) {
   packages(pkgSpec: $spec){
     type
     namespaces {
@@ -32,7 +32,7 @@ query GetPkgNames ($spec : PkgSpec) {
   }
 }
 
-query GetPkgVersions ($spec : PkgSpec) {
+query GetPkgVersions ($spec : PkgSpec!) {
   packages(pkgSpec: $spec){
     type
     namespaces {
@@ -51,43 +51,43 @@ query GetPkgVersions ($spec : PkgSpec) {
   }
 }
 
-query GetSrc  ($spec: SourceSpec) {
+query GetSrc  ($spec: SourceSpec!) {
   sources(sourceSpec: $spec){
     ...allSrcTree
   }
 }
 
-query GetArtifact ($spec: ArtifactSpec) {
+query GetArtifact ($spec: ArtifactSpec!) {
   artifacts(artifactSpec: $spec){
     ...allArtifactTree
   }
 }
 
-query GetCve ($spec: CVESpec) {
+query GetCve ($spec: CVESpec!) {
     cve(cveSpec: $spec) {
         ...allCveTree
     }
 }
 
-query GetIsDependency($spec: IsDependencySpec) {
+query GetIsDependency($spec: IsDependencySpec!) {
   IsDependency(isDependencySpec: $spec){
       ...allIsDependencyTree
   }
 }
 
-query GetIsOccurrence($spec: IsOccurrenceSpec) {
+query GetIsOccurrence($spec: IsOccurrenceSpec!) {
   IsOccurrence(isOccurrenceSpec: $spec){
       ...allIsOccurrencesTree
   }
 }
 
-query GetHasSourceAt($spec: HasSourceAtSpec) {
+query GetHasSourceAt($spec: HasSourceAtSpec!) {
   HasSourceAt(hasSourceAtSpec: $spec){
       ...allHasSourceAtTree
   }
 }
 
-query GetCertifyVuln($spec: CertifyVulnSpec) {
+query GetCertifyVuln($spec: CertifyVulnSpec!) {
   CertifyVuln(certifyVulnSpec: $spec){
       ...allCertifyVulnTree
   }