diff --git a/OrderManagement/Properties/AssemblyInfo.cs b/OrderManagement/Properties/AssemblyInfo.cs
index 486f00830..e28e51bcb 100644
--- a/OrderManagement/Properties/AssemblyInfo.cs
+++ b/OrderManagement/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.10.0")]
-[assembly: AssemblyFileVersion("3.0.10.0")]
+[assembly: AssemblyVersion("3.0.11.0")]
+[assembly: AssemblyFileVersion("3.0.11.0")]
diff --git a/SharedDatabase/Entities/OrderInfo.cs b/SharedDatabase/Entities/OrderInfo.cs
index fe6a614a2..cad9627d8 100644
--- a/SharedDatabase/Entities/OrderInfo.cs
+++ b/SharedDatabase/Entities/OrderInfo.cs
@@ -201,6 +201,9 @@ namespace SharedDatabase.Entities
                         return false;
                     }
                     return true;
+                case 1:     /// POState
+                    if (ParamValues(i).Contains(str)) return true;
+                    break;
                 case 2:     /// Workflow
                 case 3:     /// TestProcedure
                 case 9:     /// LaserMarking
@@ -212,16 +215,13 @@ namespace SharedDatabase.Entities
                 case 4:     /// VariantCode
                 case 5:     /// VacoDescription
                 case 6:     /// MadeInText
-                case 7:     /// Year
-                    if (int.TryParse(str, out idummy) && idummy > 2020 && idummy < 2099) return true;
-                    break;
                 case 8:     /// ModuleParam
                     /// string (incl. an empty one)
                     if (str != null) return true;
                     message = string.Format("Should not be null", ParamName(i));
                     return false;
-                case 1:     /// POState
-                    if (ParamValues(i).Contains(str)) return true;
+                case 7:     /// Year
+                    if (int.TryParse(str, out idummy) && idummy > 2020 && idummy < 2099) return true;
                     break;
                 case 11:    /// PiecesCount
                 case 14:    /// SNDigits