diff --git a/Results/Forms/BatchResultsDlg.cs b/Results/Forms/BatchResultsDlg.cs
index 3c420573a..c7160a1d3 100644
--- a/Results/Forms/BatchResultsDlg.cs
+++ b/Results/Forms/BatchResultsDlg.cs
@@ -150,17 +150,17 @@ namespace Results.Forms
                 {
                     if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
                     {
-                        if (TestsArrangement == TestsArrangement.Rows)
+                        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        if (lview != null)
                         {
-                            ListView lview = GetResultsTestsAreRows(results.WaterMeters[i], i + 1);
-                            if (first) { firstListView = lview; first = false; }
-                            if (lview != null) flowLayoutPanel.Controls.Add(lview);
-                        }
-                        else
-                        {
-                            ListView lview = GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
-                            if (first) { firstListView = lview; first = false; }
-                            if (lview != null) flowLayoutPanel.Controls.Add(lview);
+                            flowLayoutPanel.Controls.Add(lview);
+                            if (first)
+                            {
+                                firstListView = lview;
+                                first = false;
+                            }
                         }
                     }
                 }
@@ -318,7 +318,7 @@ namespace Results.Forms
                     if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
 																			mtr.Publish() != Config.Entities.Publish.Internal)
                     {
-                        string str = items[i].Print(wMtr, mtr.Name());
+                        string str = item.Print(wMtr, mtr.Name());
 
                         string[] texts = str.Split(new char[] { '|' });
                         if (texts.Length == 1)
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index 727955f1f..0c8703d83 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Results")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2017 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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("2.17.762.0")]
-[assembly: AssemblyFileVersion("2.17.762.0")]
+[assembly: AssemblyVersion("2.18.782.0")]
+[assembly: AssemblyFileVersion("2.18.782.0")]
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index f05ab4c41..7b12c2849 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -625,5 +625,13 @@ namespace Results
         {
             return GetItem((int)itemId);
         }
+
+        public override string ToString()
+        {
+            if (!string.IsNullOrEmpty(Caption))
+                return Caption;
+            else
+                return ((ItemID)Uid).ToString();
+        }
     }
 }
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 5915be1f3..0f20c617c 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2017 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2018 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.17.777.0")]
-[assembly: AssemblyFileVersion("2.17.777.0")]
+[assembly: AssemblyVersion("2.17.782.0")]
+[assembly: AssemblyFileVersion("2.17.782.0")]
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
index cd6210045..c4c3e4a6e 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -233,18 +233,18 @@ namespace TBF.Screens
 				{
 					if (results.WaterMeters[i] != null && !results.WaterMeters[i].Disabled)
 					{
-						if (TestsArrangement == TestsArrangement.Rows)
-						{
-							ListView lview = GetResultsTestsAreRows(results.WaterMeters[i], i + 1);
-							if (first) { firstListView = lview; first = false; }
-							if (lview != null) flowLayoutPanel.Controls.Add(lview);
-						}
-						else
-						{
-							ListView lview = GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
-							if (first) { firstListView = lview; first = false; }
-							if (lview != null) flowLayoutPanel.Controls.Add(lview);
-						}
+				        ListView lview = (TestsArrangement == TestsArrangement.Rows)
+                                       ? GetResultsTestsAreRows(results.WaterMeters[i], i + 1)
+                                       : GetResultsTestsAreColumns(results.WaterMeters[i], i + 1);
+                        if (lview != null)
+                        {
+                            flowLayoutPanel.Controls.Add(lview);
+                            if (first)
+                            {
+                                firstListView = lview;
+                                first = false;
+                            }
+                        }
 					}
 				}
 			}
@@ -416,7 +416,7 @@ namespace TBF.Screens
 						mtr.Publish() != Config.Entities.Publish.Never &&
 						mtr.Publish() != Config.Entities.Publish.Internal)
 					{
-						string str = items[i].Print(wMtr, mtr.Name());
+                        string str = item.Print(wMtr, mtr.Name());
 
                         string[] texts = str.Split(new char[] { '|' });
                         if (texts.Length == 1)