diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 4e7185a5..48ff28af 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -86,7 +86,7 @@ defined('EXIT__AUTO_MAX')      OR define('EXIT__AUTO_MAX', 125); // highest auto
 
 // define login route name for token verification
 //defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', '(listLessPDDetails/:any)'); // no errors
-defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getListOfProducts'); // no errors
+defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getFullPDDetails'); // no errors
 
 /*********************AWS resources Constants*************************************************/
 defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');
diff --git a/api/application/config/routes.php b/api/application/config/routes.php
index 3c1a8543..fc255fbf 100644
--- a/api/application/config/routes.php
+++ b/api/application/config/routes.php
@@ -98,7 +98,7 @@ $route['saveExistQuestion'] = 'Question_Management_Controller/saveExistQuestion'
 $route['updateAnswerStatus'] = 'Question_Management_Controller/updateAnswerStatus'; 
 
 //ENTITY MANAGEMENT
-$route['listAllEntites'] = 'Entity_Management_Controller/listAllEntites'; 
+$route['(listAllEntites/:any)'] = 'Entity_Management_Controller/listAllEntites/'; 
 $route['saveNewEntity'] = 'Entity_Management_Controller/saveNewEntity'; 
 $route['saveExistEntity'] = 'Entity_Management_Controller/saveExistEntity'; 
 
diff --git a/api/application/controllers/Entity_Management_Controller.php b/api/application/controllers/Entity_Management_Controller.php
index ce18cc2f..51d03c11 100644
--- a/api/application/controllers/Entity_Management_Controller.php
+++ b/api/application/controllers/Entity_Management_Controller.php
@@ -24,8 +24,14 @@ class Entity_Management_Controller extends REST_Controller {
    
 	public function listAllEntites_get()
 	{
+		$page = 0;$limit = 0;$sort = 'ASC';$entity_type_id = '';
 		
-		$result = $this->Entity_Management_Model->$listAllEntities();
+		if($this->get('page')) { $page  = $this->get('page'); }
+		if($this->get('limit')){ $limit = $this->get('limit'); }
+		if($this->get('sort')) { $sort  = $this->get('sort'); }
+		if($this->get('etid')) { $entity_type_id  = $this->get('etid'); }
+		
+		$result = $this->Entity_Management_Model->$listAllEntities($page,$limit,$sort,$entity_type_id);
 		if($result['data_status'])
 		{
 				$data['dataStatus'] = true;
diff --git a/api/application/models/Entity_Management_Model.php b/api/application/models/Entity_Management_Model.php
index e6b9167a..8821a0c0 100644
--- a/api/application/models/Entity_Management_Model.php
+++ b/api/application/models/Entity_Management_Model.php
@@ -10,7 +10,7 @@ class Entity_Management_Model extends SPARQ_Model {
         }
 		
 		
-   public function listAllEntities()
+   public function listAllEntities($page,$limit,$sort,$entity_type_id)
    {
 	   $result_data = array();
 	   
@@ -23,6 +23,12 @@ class Entity_Management_Model extends SPARQ_Model {
 	  $this->db->JOIN(USERPROFILE.' as USERPROFILE','ENTITY.fk_createdby = USERPROFILE.userid');
 	  $this->db->JOIN(USERPROFILE.' as USERPROFILE1','ENTITY.fk_updatedby = USERPROFILE1.userid','LEFT');
 	  $this->db->JOIN(ENTITYTYPE.' as ENTITYTYPE','ENTITY.fk_entity_type_id = ENTITYTYPE.entity_type_id');
+	  if($entity_type_id != null || $entity_type_id != '')
+	   {
+		    $this->db->WHERE('ENTITY.fk_entity_type_id',$entity_type_id);
+	   }
+	   $this->db->ORDER_BY('ENTITY.fk_entity_type_id',$sort);
+	   $this->db->LIMIT($page,$limit);
 	
 	    
 	   $result = $this->db->get()->result_array();
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 13af8745..d7ed47dc 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -38,7 +38,7 @@ class PD_Model extends SPARQ_Model {
 				foreach($result_array as $key => $result)
 				{
 					
-					$this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode');
+					$this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode,PDAPPLICANTSDETAILS.relation');
 					$this->db->FROM(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS');
 					$this->db->JOIN(STATE.' as STATE','PDAPPLICANTSDETAILS.fk_state = STATE.state_id ');
 					$this->db->JOIN(CITY.' as CITY','PDAPPLICANTSDETAILS.fk_city = CITY.city_id');
@@ -127,7 +127,7 @@ class PD_Model extends SPARQ_Model {
 	*/
 	public function getApplicantsDetails($pdid)
 	{
-		$this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode');
+		$this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.addressline1, PDAPPLICANTSDETAILS.addressline2, PDAPPLICANTSDETAILS.addressline3, PDAPPLICANTSDETAILS.fk_city, PDAPPLICANTSDETAILS.fk_state, PDAPPLICANTSDETAILS.pincode,PDAPPLICANTSDETAILS.relation');
 		$this->db->FROM(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS');
 		$this->db->JOIN(STATE.' as STATE','PDAPPLICANTSDETAILS.fk_state = STATE.state_id');
 		$this->db->JOIN(CITY.' as CITY','PDAPPLICANTSDETAILS.fk_city = CITY.city_id');
@@ -172,7 +172,7 @@ class PD_Model extends SPARQ_Model {
 			$result_array['pd_master_logs'] = $this->db->GET()->result_array();
 			
 			
-			$this->db->SELECT('PDAPPLICANTSLOGS.pd_co_applicant_id, PDAPPLICANTSLOGS.fk_pd_id, PDAPPLICANTSLOGS.applicant_name, PDAPPLICANTSLOGS.applicant_type, PDAPPLICANTSLOGS.mobile_no, PDAPPLICANTSLOGS.email, PDAPPLICANTSLOGS.addressline1, PDAPPLICANTSLOGS.addressline2, PDAPPLICANTSLOGS.addressline3, PDAPPLICANTSLOGS.fk_city, PDAPPLICANTSLOGS.fk_state, PDAPPLICANTSLOGS.pincode');
+			$this->db->SELECT('PDAPPLICANTSLOGS.pd_co_applicant_id, PDAPPLICANTSLOGS.fk_pd_id, PDAPPLICANTSLOGS.applicant_name, PDAPPLICANTSLOGS.applicant_type, PDAPPLICANTSLOGS.mobile_no, PDAPPLICANTSLOGS.email, PDAPPLICANTSLOGS.addressline1, PDAPPLICANTSLOGS.addressline2, PDAPPLICANTSLOGS.addressline3, PDAPPLICANTSLOGS.fk_city, PDAPPLICANTSLOGS.fk_state, PDAPPLICANTSLOGS.pincode,PDAPPLICANTSDETAILS.relation');
 			$this->db->FROM(PDAPPLICANTSLOGS.' as PDAPPLICANTSLOGS');
 			$this->db->JOIN(STATE.' as STATE','PDAPPLICANTSLOGS.fk_state = STATE.state_id');
 			$this->db->JOIN(CITY.' as CITY','PDAPPLICANTSLOGS.fk_city = CITY.city_id');