diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index f1cf372b..5560b6e5 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -1388,7 +1388,8 @@ class Fees_status_model extends CI_Model
 
                 $this->db->select('ListCode');
                 $this->db->from('T_PickListDetails');
-                $this->db->where('ListName','EXPECTED'); 
+                // $this->db->where('ListName','EXPECTED'); 
+                $this->db->where('ListName','NOT APPLICABLE');
                 $this->db->where('IsActive',1); 
                 $this->db->where('BranchCode',$details['BranchCode']);
 
@@ -1515,7 +1516,8 @@ class Fees_status_model extends CI_Model
 
         $this->db->select('ListCode');
         $this->db->from('T_PickListDetails');
-        $this->db->where('ListName','EXPECTED');
+        // $this->db->where('ListName','EXPECTED');
+        $this->db->where('ListName','NOT APPLICABLE');
         $this->db->where('IsActive',1);  
         $this->db->where('BranchCode',$details['BranchCode']);
 
@@ -2027,7 +2029,8 @@ class Fees_status_model extends CI_Model
         else{
             // Status 
             // $this->db->where('ListName','Fees update Status');
-            $this->db->where('ListName','EXPECTED');
+            // $this->db->where('ListName','EXPECTED');
+            $this->db->where('ListName','NOT APPLICABLE');
         }
 
         $this->db->where('BranchCode',$feesDetails['UpdatedBy']);
diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php
index f1e77282..6424b9da 100755
--- a/Apollo/api/application/models/Studentview_model.php
+++ b/Apollo/api/application/models/Studentview_model.php
@@ -564,6 +564,7 @@ class Studentview_model extends CI_Model
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('AS.StudentID', $studentID);
         $this->db->where('CM.CertificateName', APPLICATION_CONST);
+        $this->db->where('PLD.ListCode !=','');
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
         // print_r($this->db->last_query());die();