diff --git a/src/main/webapp/html/farmrepository/view_farm_repository.jsp b/src/main/webapp/html/farmrepository/view_farm_repository.jsp
index 2881282..ad21687 100644
--- a/src/main/webapp/html/farmrepository/view_farm_repository.jsp
+++ b/src/main/webapp/html/farmrepository/view_farm_repository.jsp
@@ -192,10 +192,10 @@ $(function () {
 									style="margin-left: 10px; margin-right: 10px; color: #666;">${form.status}</span>
 									<c:if test = "${form.status == 'COMPLETE'}">
 										<c:choose>
-											<c:when test= "${form.batchType == 'GROW_OUT_AGGREGATED' or form.batchType == 'HATCHERY_AGGREGATED'}">
+											<c:when test= "${form.batchType == 'HATCHERY_AGGREGATED'}">
 												<button class="btn" type="button" disabled title='Analysis not available for this Batch type'>Analyse</button>
 											</c:when>
-											<c:when test= "${form.batchType == 'GROW_OUT_AGGREGATED_CLOSED_BATCHES'}" >
+											<c:when test= "${form.batchType == 'GROW_OUT_AGGREGATED' or form.batchType == 'GROW_OUT_AGGREGATED_CLOSED_BATCHES'}" >
 												<div style="display: inline;">
 													<button  class="btn" type="button" 
 													onClick="checkBatchesThresholdAnnualData(this,