diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
index bd2364c..2ba843a 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
@@ -685,8 +685,10 @@ public class PerformFishAnnualAnalyticsController {
 						String title = toTitle;
 						switch (chartType) {
 						case BOXPLOT:
-							title = chartType.getName()+" - on all batches<br>";
-							title += "Blue dots indicate the selected batch(es): "+focusID;
+							//title = chartType.getName()+" - on all batches<br>";
+							//title += "Blue dots indicate the selected batch(es): "+focusID;
+							title = chartType.getName()+" - on all farm data<br>";
+							title += "Blue dots indicate the selected farm: "+focusID;
 							break;
 						case CORRELATION:
 							break;
@@ -696,8 +698,8 @@ public class PerformFishAnnualAnalyticsController {
 							break;
 						case SPEEDOMETER:
 							title = "Speedometer<br>";
-							title+= "Selected BATCH ID: "+focusID+"<br>";
-							title+= "Normalized with respect to all batches in the VRE";
+							title+= "Selected Farm: "+focusID+"<br>";
+							title+= "Normalized with respect to all farm data in the VRE";
 							break;
 						case DEA_CHART:
 							break;
@@ -726,10 +728,16 @@ public class PerformFishAnnualAnalyticsController {
 						String title = toTitle;
 						switch (chartType) {
 						case BOXPLOT:
+//							if(result.getFileName().contains("_user")){
+//								title = "My Batch(es)";
+//							}else{
+//								title = "All batches in the VRE (including mine)";
+//							}
 							if(result.getFileName().contains("_user")){
 								title = "My Batch(es)";
+								return;
 							}else{
-								title = "All batches in the VRE (including mine)";
+								title = "All farm data in the VRE (including mine)";
 							}
 							break;
 						case CORRELATION: