diff --git a/data/local_vulnerable_files.xsd b/data/local_vulnerable_files.xsd
index 5ca834e6..f35c8055 100644
--- a/data/local_vulnerable_files.xsd
+++ b/data/local_vulnerable_files.xsd
@@ -4,7 +4,9 @@
 
   <xs:simpleType name="stringtype">
     <xs:restriction base="xs:string">
+      <xs:whiteSpace value="preserve" />
       <xs:minLength value="1" />
+      <xs:pattern value="[^\s].+[^\s]|[^\s]"/>
     </xs:restriction>
   </xs:simpleType>
 
diff --git a/data/plugin_vulns.xml b/data/plugin_vulns.xml
index baedfdb3..d7c0a673 100644
--- a/data/plugin_vulns.xml
+++ b/data/plugin_vulns.xml
@@ -291,7 +291,7 @@
       <fixed_in>1.4.3</fixed_in>
     </vulnerability>
     <vulnerability>
-      <title>Floating Social Media Links &lt;= 1.4.2 - fsml-hideshow.js.php wpp Parameter Remote File Inclusion </title>
+      <title>Floating Social Media Links &lt;= 1.4.2 - fsml-hideshow.js.php wpp Parameter Remote File Inclusion</title>
       <references>
         <osvdb>88385</osvdb>
         <secunia>51346</secunia>
@@ -1902,7 +1902,7 @@
 
   <plugin name="gallery-plugin">
     <vulnerability>
-      <title>Gallery 3.06 - gallery-plugin/upload/php.php File Upload PHP Code Execution </title>
+      <title>Gallery 3.06 - gallery-plugin/upload/php.php File Upload PHP Code Execution</title>
       <references>
         <osvdb>82661</osvdb>
         <exploitdb>18998</exploitdb>
@@ -9232,7 +9232,7 @@
 
   <plugin name="q-and-a">
     <vulnerability>
-      <title>Q and A 1.0.6.2 - Multiple Scripts Direct Request Path Disclosure </title>
+      <title>Q and A 1.0.6.2 - Multiple Scripts Direct Request Path Disclosure</title>
       <references>
         <osvdb>100793</osvdb>
       </references>
diff --git a/data/vuln.xsd b/data/vuln.xsd
index 69814126..5d9c0276 100644
--- a/data/vuln.xsd
+++ b/data/vuln.xsd
@@ -4,7 +4,9 @@
 
   <xs:simpleType name="stringtype">
     <xs:restriction base="xs:string">
+      <xs:whiteSpace value="preserve" />
       <xs:minLength value="1" />
+      <xs:pattern value="[^\s].+[^\s]|[^\s]"/>
     </xs:restriction>
   </xs:simpleType>
 
diff --git a/data/wp_versions.xsd b/data/wp_versions.xsd
index a4a64ae5..395b96c9 100644
--- a/data/wp_versions.xsd
+++ b/data/wp_versions.xsd
@@ -4,7 +4,9 @@
 
   <xs:simpleType name="stringtype">
     <xs:restriction base="xs:string">
+      <xs:whiteSpace value="preserve" />
       <xs:minLength value="1" />
+      <xs:pattern value="[^\s].+[^\s]|[^\s]"/>
     </xs:restriction>
   </xs:simpleType>