=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2014-09-08 09:08:39 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2014-10-08 08:48:34 +0000
@@ -38,6 +38,7 @@
     $scope.selectedTeiId = ($location.search()).tei; 
     $scope.selectedProgramId = ($location.search()).program; 
     $scope.selectedOrgUnit = storage.get('SELECTED_OU');
+
     $scope.selectedProgram;    
     $scope.selectedTei;    
     
@@ -71,8 +72,7 @@
                 });
             });            
         });      
-    }
-    
+    }    
     
     //listen for any change to program selection
     //it is possible that such could happen during enrollment.

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2014-10-03 08:25:10 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html	2014-10-08 08:48:34 +0000
@@ -57,14 +57,14 @@
                         class="btn btn-danger horizonal-spacing"
                         ng-if="selectedEnrollment.followup"
                         ng-click="markForFollowup()">
-                    <i class="fa fa-star"></i>
+                    <i class="fa fa-exclamation-triangle"></i>
                 </button>
                 <button type="button" 
                         title="{{'mark_for_followup' | translate}}"
                         class="btn btn-default horizonal-spacing"
                         ng-if="!selectedEnrollment.followup"
                         ng-click="markForFollowup()">
-                    <i class="fa fa-star"></i>
+                    <i class="fa fa-exclamation-triangle"></i>
                 </button>
                 
             </div>

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js	2014-10-01 15:19:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js	2014-10-08 08:48:34 +0000
@@ -37,7 +37,7 @@
         $scope.selectedProgram = selections.pr;        
         $scope.selectedEnrollment = selections.enrollment; 
     
-        if($scope.selectedTei){            
+        if($scope.selectedTei && $scope.selectedOrgUnit){            
             $scope.getEvents();
         }       
     });
@@ -46,7 +46,7 @@
         
         $scope.dataFetched = false;
         $scope.dataExists = false;
-        var programId = null, orgUnitId = null;
+        var programId = null;
         
         if($scope.selectedProgram){
             programId = $scope.selectedProgram.id;
@@ -57,7 +57,7 @@
             $scope.report[pr.id] = {};
         });
         
-        DHIS2EventFactory.getEventsByProgram($scope.selectedTei.trackedEntityInstance, orgUnitId, programId).then(function(eventList){
+        DHIS2EventFactory.getEventsByProgram($scope.selectedTei.trackedEntityInstance, $scope.selectedOrgUnit.id, programId).then(function(eventList){
             angular.forEach(eventList, function(ev){
                 if(ev.program){       
                     ev.visited = true;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-08-27 10:38:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html	2014-10-08 08:48:34 +0000
@@ -73,8 +73,6 @@
                 <button class="btn btn-primary trim" type="button" title="{{'search'| translate}}" ng-disabled="showRegistrationDiv || showReportDiv" ng-click="search(searchMode.freeText)"><i class="fa fa-search"></i></button>
                 <div id="searchDropDown" class="dropdown-menu dropdown-menu-right">
                     <form ng-submit="search(searchMode.attributeBased)">
-                        <!-- had to disable ng-include to avoid dealing with a separate controller/scope issue-->
-                        <!--<div ng-include="'views/search.html'"></div>-->
                         <div class="search-container-main">
                             <div class="search-container">    
                                 <table data-stop-propagation="true" class="table-borderless table-striped">

=== removed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search.html	2014-08-12 14:48:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search.html	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-<div class="search-container-main">
-    <div class="search-container">    
-        <table data-stop-propagation="true" class="table-borderless table-striped">
-            <tr>
-                <td>{{'org_unit'| translate}}</td>
-                <td>                    
-                    <label><input type="radio" ng-model="selectedOuMode.name" name="selected" value="SELECTED"> {{'SELECTED'| translate}}</label><br/>
-                    <label><input type="radio" ng-model="selectedOuMode.name" name="children" value="CHILDREN"> {{'CHILDREN'| translate}}</label><br/>
-                    <label><input type="radio" ng-model="selectedOuMode.name" name="descendants" value="DESCENDANTS"> {{'DESCENDANTS'| translate}}</label><br/>
-                    <label><input type="radio" ng-model="selectedOuMode.name" name="accessible" value="ACCESSIBLE"> {{'ACCESSIBLE'| translate}}</label>
-                </td>
-            </tr>
-            <tr ng-if="selectedProgram">
-                <td>{{'enrollment_date'| translate}}</td>
-                <td>
-                    <div class="dataelement-filter">
-                        <div class="filter-operator">
-                            <select ng-model="enrollment.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
-                            </select>
-                        </div>
-                        <div class="filter-value" ng-show="enrollment.operator === defaultOperators[0]">
-                            <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programExactDate"/>
-                        </div>
-                        <div class="filter-value" ng-show="enrollment.operator === defaultOperators[1]">
-                            <div class="container-1-2">
-                                <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programStartDate"/>
-                            </div>
-                            <div class="container-1-2">
-                                <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="enrollment.programEndDate"/>                
-                            </div>
-                        </div>                    
-                    </div>                
-                </td>
-            </tr>
-            <tr ng-repeat="attribute in attributes">
-                <td>
-                    {{attribute.name}}
-                </td>
-                <td>
-                    <div ng-switch="attribute.valueType">
-                        <div ng-switch-when="number">
-                            <div class="dataelement-filter">                                                
-                                <div class="filter-operator">
-                                    <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
-                                    </select>
-                                </div>
-                                <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
-                                    <input type="number" placeholder="{{'exact_value'| translate}}" class="form-control-select2" ng-model="attribute.exactValue"/>
-                                </div>
-                                <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
-                                    <div class="container-1-2">
-                                        <input type="number" placeholder="{{'from'| translate}}" class="form-control-select2" ng-model="attribute.startValue"/>
-                                    </div>
-                                    <div class="container-1-2">
-                                        <input type="number" placeholder="{{'to'| translate}}" class="form-control-select2" ng-model="attribute.endValue"/>                
-                                    </div>
-                                </div>                            
-                            </div>                        
-                        </div>
-                        <div ng-switch-when="date">
-                            <div class="dataelement-filter">
-                                <div class="filter-operator">
-                                    <select ng-model="attribute.operator" class="form-control-select2" ng-options="operator | translate for operator in defaultOperators">
-                                    </select>
-                                </div>
-                                <div class="filter-value" ng-show="attribute.operator === defaultOperators[0]">
-                                    <input type="text" placeholder="{{'exact_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.exactValue"/>
-                                </div>
-                                <div class="filter-value" ng-show="attribute.operator === defaultOperators[1]">
-                                    <div class="container-1-2">
-                                        <input type="text" placeholder="{{'start_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.startValue"/>
-                                    </div>
-                                    <div class="container-1-2">
-                                        <input type="text" placeholder="{{'end_date'| translate}}" class="form-control-select2" ng-date ng-model="attribute.endValue"/>                
-                                    </div>
-                                </div>                            
-                            </div> 
-                        </div>                        
-                        <div ng-switch-when="optionSet">
-                            <select multiple ui-select2  ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
-                                <option ng-repeat="option in attribute.optionSet.options" value="{{option.code}}">{{option.name}}</option>
-                            </select>
-                        </div>
-                        <div ng-switch-when="bool">
-                            <select ui-select2  ng-model="attribute.value" data-placeholder="{{'please_select'| translate}}" style="width:100%;">
-                                <option ng-repeat="option in boolOperators" value="{{option}}">{{option| translate}}</option>
-                            </select>
-                        </div> 
-                        <div ng-switch-default>
-                            <input type="text" class="form-control-select2" ng-model="attribute.value" /> 
-                        </div>
-                    </div>
-                </td>
-            </tr>         
-        </table>
-    </div>
-
-    <div class="horizonal-spacing">
-        <button type="submit"
-                class="btn btn-primary"
-                ng-click="search(searchMode.attributeBased)">
-            {{'search'| translate}}
-        </button>
-        <button type="button" 
-                class="btn btn-success small-horizonal-spacing" 
-                ng-click="search(searchMode.listAll)">
-            {{'list_all'| translate}}
-        </button>        
-    </div>
-</div>
\ No newline at end of file