diff --git a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html
index 724604f86..f5c10b4b3 100644
--- a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html
+++ b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.html
@@ -161,7 +161,7 @@
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../view']">{{"labels.buttons.Cancel" | translate}}</button>
         <button mat-raised-button color="primary" [disabled]="!editStandingInstructionsForm.valid"
-        (click)="submit()" *mifosxHasPermission="'UPDATE_STANDINGINSTRUCTION'">{{"labels.buttons.Submit | translate}}</button>
+        (click)="submit()" *mifosxHasPermission="'UPDATE_STANDINGINSTRUCTION'">{{"labels.buttons.Submit" | translate}}</button>
       </mat-card-actions>
 
     </form>
diff --git a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.ts b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.ts
index 95f5e30c0..7c487df6c 100644
--- a/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.ts
+++ b/src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.ts
@@ -39,7 +39,7 @@ export class EditStandingInstructionsComponent implements OnInit {
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
   /** Maximum date allowed. */
-  maxDate = new Date();
+  maxDate = new Date(2100,0,1);
 
   /**
    * Retrieves the standing instructions template from `resolve`.
@@ -70,7 +70,6 @@ export class EditStandingInstructionsComponent implements OnInit {
    * Creates and sets the edit standing instructions form.
    */
   ngOnInit() {
-    this.maxDate = this.settingsService.businessDate;
     this.createEditStandingInstructionsForm();
     const presentDate = new Date();
     const n = presentDate.getFullYear();
diff --git a/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html b/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html
index 32c7c2203..f636c7e60 100644
--- a/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html
+++ b/src/app/account-transfers/list-standing-instructions/list-standing-instructions.component.html
@@ -36,7 +36,7 @@
     </mat-form-field>
 
     <button mat-raised-button color="primary" *mifosxHasPermission="'READ_STANDINGINSTRUCTION'" (click)="filterStandingInstructions()" class="filter-button">
-      &nbsp;&nbsp;{{  "labels.buttons.filter" | translate}}
+      &nbsp;&nbsp;{{  "labels.buttons.Filter" | translate}}
     </button>
   </div>
 
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index 69c98508d..54b9b7ed6 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -389,6 +389,7 @@
       "Export": "Vývozní",
       "Export CSV": "Vývozní CSV",
       "Export XLS": "Vývozní XLS",
+      "Filter": "filtr",
       "Foreclosure": "Exekuce",
       "GLIM Loan Application": "Žádost o půjčku GLIM",
       "GSIM Application": "Aplikace GSIM",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 461e437a7..ef19018b2 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -389,6 +389,7 @@
       "Export": "Export",
       "Export CSV": "CSV exportieren",
       "Export XLS": "XLS exportieren",
+      "Filter": "Filter",
       "Foreclosure": "Zwangsvollstreckung",
       "GLIM Loan Application": "GLIM-Kreditantrag",
       "GSIM Application": "GSIM-Anwendung",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index ac629292e..f25c047a9 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -389,6 +389,7 @@
             "Export": "Export",
             "Export CSV": "Export CSV",
             "Export XLS": "Export XLS",
+            "Filter": "filter",
             "Foreclosure": "Foreclosure",
             "GLIM Loan Application": "GLIM Loan Application",
             "GSIM Application": "GSIM Application",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index b75efde14..3fa8123fa 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -389,6 +389,7 @@
             "Export": "Exportar",
             "Export CSV": "Exportar CSV",
             "Export XLS": "Exportar XLS",
+            "Filter": "filtrar",
             "Foreclosure": "Juicio hipotecario",
             "GLIM Loan Application": "Solicitud de Crédito GLIM",
             "GSIM Application": "Aplicación GSIM",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index 153132060..65316e3d3 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -389,6 +389,7 @@
       "Export": "Exporter",
       "Export CSV": "Exporter au format CSV",
       "Export XLS": "Exporter au format XLS",
+      "Filter": "filtre",
       "Foreclosure": "Forclusion",
       "GLIM Loan Application": "Demande de prêt GLIM",
       "GSIM Application": "Demande GSIM",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 57726777f..1901ab9db 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -389,6 +389,7 @@
       "Export": "Esportare",
       "Export CSV": "Esporta CSV",
       "Export XLS": "Esporta XLS",
+      "Filter": "filtro",
       "Foreclosure": "Pignoramento",
       "GLIM Loan Application": "Richiesta di prestito GLIM",
       "GSIM Application": "Applicazione GSMIM",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 1d90192c8..3fa7132a3 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -389,6 +389,7 @@
       "Export": "내보내다",
       "Export CSV": "CSV 내보내기",
       "Export XLS": "XLS 내보내기",
+      "Filter": "필터",
       "Foreclosure": "유질",
       "GLIM Loan Application": "GLIM 대출 신청",
       "GSIM Application": "GSIM 애플리케이션",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index c49f3090b..f147938a9 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -389,6 +389,7 @@
       "Export": "Eksportuoti",
       "Export CSV": "Eksportuoti CSV",
       "Export XLS": "Eksportuoti XLS",
+      "Filter": "filtras",
       "Foreclosure": "Uždarymas",
       "GLIM Loan Application": "GLIM paskolos paraiška",
       "GSIM Application": "GSIM programa",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index da52d3670..27b4464a7 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -389,6 +389,7 @@
       "Export": "Eksportēt",
       "Export CSV": "Eksportēt CSV",
       "Export XLS": "Eksportēt XLS",
+      "Filter": "filtrēt",
       "Foreclosure": "Preces ierobežošana",
       "GLIM Loan Application": "GLIM aizdevuma pieteikums",
       "GSIM Application": "GSIM lietojumprogramma",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index b69dfc761..24a9982bd 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -389,6 +389,7 @@
       "Export": "निर्यात गर्नुहोस्",
       "Export CSV": "CSV निर्यात गर्नुहोस्",
       "Export XLS": "XLS निर्यात गर्नुहोस्",
+      "Filter": "फिल्टर",
       "Foreclosure": "फोरक्लोजर",
       "GLIM Loan Application": "GLIM ऋण आवेदन",
       "GSIM Application": "GSIM आवेदन",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index 52d21ed93..4fa2692f2 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -389,6 +389,7 @@
       "Export": "Exportar",
       "Export CSV": "Exportar CSV",
       "Export XLS": "Exportar XLS",
+      "Filter": "filtro",
       "Foreclosure": "Execução hipotecária",
       "GLIM Loan Application": "Solicitação de empréstimo GLIM",
       "GSIM Application": "Aplicação GSM",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index 8a40d905c..9a44a213e 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -389,6 +389,7 @@
       "Export": "Hamisha",
       "Export CSV": "Hamisha CSV",
       "Export XLS": "Hamisha XLS",
+      "Filter": "Kichujio",
       "Foreclosure": "Foreclosure",
       "GLIM Loan Application": "Maombi ya Mkopo wa GLIM",
       "GSIM Application": "Maombi ya GSIM",