diff --git a/.changeset/unlucky-lobsters-jam.md b/.changeset/unlucky-lobsters-jam.md
new file mode 100644
index 000000000..92d168c3d
--- /dev/null
+++ b/.changeset/unlucky-lobsters-jam.md
@@ -0,0 +1,6 @@
+---
+"@cube-creator/cli": patch
+"@cube-creator/ui": patch
+---
+
+Improve error messages and prevent mixing language and datatype
diff --git a/cli/lib/validation.ts b/cli/lib/validation.ts
index 39e0ff079..66ace0933 100644
--- a/cli/lib/validation.ts
+++ b/cli/lib/validation.ts
@@ -20,7 +20,6 @@ function quadToString(quad: Quad): string {
   })
 }
 
-// consider replacing should with may
 const messages = new TermMap<NamedNode, string>([
   [xsd.boolean, 'Boolean values should be formatted as "true" and "false" (or "0" and "1"). See also https://www.w3.org/TR/xmlschema-2/#boolean.'],
   [xsd.date, 'Dates should be formatted as YYYY-MM-DD as specified by ISO 8601. See also https://www.w3.org/TR/xmlschema-2/#date.'],