=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2016-01-12 11:24:22 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js	2016-01-14 15:22:18 +0000
@@ -2373,11 +2373,6 @@
 				paramString += i < dxItems.length - 1 ? ';' : '';
 			}
 
-            // program
-            if (view.program) {
-                paramString += '&program=' + view.program.id;
-            }
-
 			paramString += isOperand ? '&dimension=co' : '';
 
 			// pe

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js	2015-12-03 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js	2016-01-14 15:22:18 +0000
@@ -3694,11 +3694,6 @@
 				paramString += i < dxItems.length - 1 ? ';' : '';
 			}
 
-            // program
-            if (view.program) {
-                paramString += '&program=' + view.program.id;
-            }
-
 			paramString += isOperand ? '&dimension=co' : '';
 
 			// pe

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2016-01-14 15:22:18 +0000
@@ -2195,11 +2195,6 @@
 					paramString += '&approvalLevel=' + xLayout.dataApprovalLevel.id;
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js	2015-12-03 16:04:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js	2016-01-14 15:22:18 +0000
@@ -2188,11 +2188,6 @@
 					paramString += '&approvalLevel=' + xLayout.dataApprovalLevel.id;
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2016-01-14 13:18:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js	2016-01-14 15:22:18 +0000
@@ -2514,11 +2514,6 @@
                     }
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js	2016-01-14 13:18:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js	2016-01-14 15:22:18 +0000
@@ -2465,11 +2465,6 @@
                     }
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2016-01-14 13:18:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2016-01-14 15:22:18 +0000
@@ -2514,11 +2514,6 @@
                     }
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js	2015-12-03 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js	2016-01-14 15:22:18 +0000
@@ -3694,11 +3694,6 @@
 				paramString += i < dxItems.length - 1 ? ';' : '';
 			}
 
-            // program
-            if (view.program) {
-                paramString += '&program=' + view.program.id;
-            }
-
 			paramString += isOperand ? '&dimension=co' : '';
 
 			// pe

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js	2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js	2016-01-14 15:22:18 +0000
@@ -2188,11 +2188,6 @@
 					paramString += '&approvalLevel=' + xLayout.dataApprovalLevel.id;
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2016-01-14 13:18:38 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js	2016-01-14 15:22:18 +0000
@@ -2514,11 +2514,6 @@
                     }
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js	2015-12-03 11:08:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js	2016-01-14 15:22:18 +0000
@@ -3694,11 +3694,6 @@
 				paramString += i < dxItems.length - 1 ? ';' : '';
 			}
 
-            // program
-            if (view.program) {
-                paramString += '&program=' + view.program.id;
-            }
-
 			paramString += isOperand ? '&dimension=co' : '';
 
 			// pe

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js	2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js	2016-01-14 15:22:18 +0000
@@ -2188,11 +2188,6 @@
 					paramString += '&approvalLevel=' + xLayout.dataApprovalLevel.id;
 				}
 
-                // TODO program
-                if (xLayout.program && xLayout.program.id) {
-                    paramString += '&program=' + xLayout.program.id;
-                }
-
                 // relative period date
                 if (xLayout.relativePeriodDate) {
                     paramString += '&relativePeriodDate=' + xLayout.relativePeriodDate;