=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java	2015-06-03 16:14:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java	2015-06-03 17:31:30 +0000
@@ -101,13 +101,20 @@
         return program;
     }
 
-    private String description;
-
-    public String getDescription()
-    {
-        return description;
-    }
-    
+    private String expressionDescription;
+    
+    public String getExpressionDescription()
+    {
+        return expressionDescription;
+    }
+
+    private String filterDescription;
+    
+    public String getFilterDescription()
+    {
+        return filterDescription;
+    }
+
     private String filter;
     
     public String getFilter()
@@ -141,7 +148,8 @@
         {
             programIndicator = programIndicatorService.getProgramIndicator( id );
             program = programIndicator.getProgram();
-            description = programIndicatorService.getExpressionDescription( programIndicator.getExpression() );        
+            expressionDescription = programIndicatorService.getExpressionDescription( programIndicator.getExpression() );
+            filterDescription = programIndicatorService.getExpressionDescription( programIndicator.getFilter() );
             filter = programIndicatorService.getExpressionDescription( programIndicator.getFilter() );
             attributes = new ArrayList<>( program.getTrackedEntityAttributes() );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-03 16:14:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm	2015-06-03 17:31:30 +0000
@@ -136,7 +136,7 @@
     </tr>	
 	<tr>
 		<td>
-			<div id='expression-description' style="padding: 5px 0 20px 0" class="{validate:{required:true}}">$!encoder.htmlEncode($!description)</div>
+			<div id='expression-description' style="padding: 5px 0 20px 0" class="{validate:{required:true}}">$!encoder.htmlEncode($!expressionDescription)</div>
 		</td>
 	</tr>
 </table>
@@ -266,7 +266,7 @@
     </tr>	
 	<tr>
 		<td>
-			<div id='filter-description' style="padding: 5px 0 20px 0">$!encoder.htmlEncode($!description)</div>
+			<div id='filter-description' style="padding: 5px 0 20px 0">$!encoder.htmlEncode($!filterDescription)</div>
 		</td>
 	</tr>
 </table>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2014-11-03 13:35:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm	2015-06-03 17:31:30 +0000
@@ -4,7 +4,7 @@
 
 <div id="contextMenu" class="contextMenu" style="width: 230px;">
   <ul id="contextMenuItems" class="contextMenuItems">
-    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programStageReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_message" )</a></li>
+    <li data-enabled="canManageTemplateMessage"><a data-target-fn="programStageReminder"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "view_template_reminder_messages" )</a></li>
     <li><a data-target-fn="showUpdateProgramStageForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "edit" )</a></li>
     <li><a data-target-fn="programStageSectionList"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "section_management" )</a></li>
     <li><a data-target-fn="viewDataEntryForm"><i class="fa fa-edit"></i>&nbsp;&nbsp;$i18n.getString( "design_data_entry_form" )</a></li>