diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index e9ae6ea6..31cc2f44 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -87,7 +87,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', '(listAllTemplates/:any)'); // no errors
-defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'saveAssessedIncomeMonthwiseItems'); // no errors
+defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getPDFormDetails'); // no errors
 
 /*********************AWS resources Constants*************************************************/
 defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index ec91116d..ed00bb78 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -1506,6 +1506,12 @@ class PD_Controller extends REST_Controller {
 			$t2 = array();
 			$group = array();	
 			$sub_group = array();	
+			
+			/////For handling Rendal form Sub array//////
+			$pre_column_name = "name";
+			$z = 0;
+			$y = 0;
+			/////For handling Rendal form Sub array//////
 			foreach($result_array as $rkey => $result)
 			{
 			  
@@ -1538,29 +1544,49 @@ class PD_Controller extends REST_Controller {
 				}
 				else// Handle child group
 				{
-					 if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter)
-					  {
-						
-							$t2 = array();
-							//$sub_group = array();
-							//echo '\n'."New-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name'];
-							// print_r(array($result['column_name']=>$result['column_value']));
-						   $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
-						   $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2;
-						   $pre_sub_group = $result['iter_sub_column_name'];
-						   $pre_sub_iter = $result['iteration'];
-					  }
-					  else
-					  {
-						 
-						 // echo '\n'."old-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name'];
-							// print_r(array($result['column_name']=>$result['column_value']));
-							 $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
-							 $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2;
-							  $pre_sub_group = $result['iter_sub_column_name'];
-							  $pre_sub_iter = $result['iteration'];
-					   }
-					   
+					if($pd_form_id != 17)
+					{
+						if($result['iter_sub_column_name'] != $pre_sub_group || $result['iteration'] != $pre_sub_iter)
+						  {
+							
+								$t2 = array();
+								//$sub_group = array();
+								//echo '\n'."New-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name'];
+								// print_r(array($result['column_name']=>$result['column_value']));
+							   $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
+							   $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2;
+							   $pre_sub_group = $result['iter_sub_column_name'];
+							   $pre_sub_iter = $result['iteration'];
+						  }
+						  else
+						  {
+							 
+							 // echo '\n'."old-".$result['iter_column_name'].$result['iteration'].$result['iter_sub_column_name'];
+								// print_r(array($result['column_name']=>$result['column_value']));
+								 $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
+								 $sub_group[$result['iter_sub_column_name']][$result['iteration']] = $t2;
+								  $pre_sub_group = $result['iter_sub_column_name'];
+								  $pre_sub_iter = $result['iteration'];
+						   }
+					}
+					else// handle Rental form Sub group
+					{
+						if($result['column_name'] == $pre_column_name)// || $result['iteration'] != $pre_sub_iter)
+						  {
+							  $t2 = array();
+							  $z++;
+							  $y++;
+							  $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
+							  $sub_group[$result['iter_sub_column_name']][$result['iteration']][$z] = $t2;
+							  //$pre_column_name = $result['column_name'];
+						  }
+						  else
+						  {
+								 $t2 = array_merge($t2,array($result['column_name']=>$result['column_value']));
+								 $sub_group[$result['iter_sub_column_name']][$result['iteration']][$z] = $t2;
+								 //$pre_column_name = $result['column_name'];
+						  }
+					}						
 					   
 				}
 			  }
@@ -1579,7 +1605,7 @@ class PD_Controller extends REST_Controller {
 			
 			// Merge subgroup into main group
 			$i = 0;
-			if(count($sub_group))
+			if(count($sub_group) && $pd_form_id != 17)
 			{
 				
 				foreach($sub_group as $key => $value)
@@ -1612,6 +1638,15 @@ class PD_Controller extends REST_Controller {
 				
 			}
 			//$final_data = array_merge($final_data,$group);
+			if($pd_form_id == 17)
+			{
+				//echo count($final_data);
+				for($i = 1;$i<=count($final_data['rental_home']);$i++)
+				{
+					$final_data['rental_home'][$i]['details_tenants'] = $sub_group['details_tenants'][$i];
+					
+				}
+			}
 			$result_array = $final_data;