diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index ee0343a3..571bdab8 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -436,7 +436,7 @@ class PD_Model extends SPARQ_Model {
 						  $this->db->SELECT('QUESTIONANSWERS.question_answer_id,QUESTIONANSWERS.answer,TEMPLATEANSWERWEIGHTAGE.template_answer_weightage_id, TEMPLATEANSWERWEIGHTAGE.fk_template_question_id, TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id, TEMPLATEANSWERWEIGHTAGE.template_answer_weightage,PDANSWER.pd_detail_answer_id');
 						  $this->db->FROM(TEMPLATEANSWERWEIGHTAGE.' as TEMPLATEANSWERWEIGHTAGE');
 						  $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id','LEFT');
-						  $this->db->JOIN(PDANSWER." as PDANSWER","QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.fk_pd_id = $pdid",'LEFT');
+						  $this->db->JOIN(PDANSWER." as PDANSWER","QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.isactive = 1 AND PDANSWER.fk_pd_id = $pdid",'LEFT');
 						 // $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']);
 						  $this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_template_question_id',$question['template_question_id']);
 						 // $this->db->WHERE('PDDETAIL.fk_pd_id',$pdid);
@@ -466,7 +466,7 @@ class PD_Model extends SPARQ_Model {
 						  $this->db->JOIN(TEMPLATEQUESTION." as TEMPLATEQUESTION","TEMPLATEANSWERWEIGHTAGE.fk_template_question_id = TEMPLATEQUESTION.template_question_id AND TEMPLATEQUESTION.fk_template_question_category_id = $category_id AND TEMPLATEQUESTION.fk_template_id = $template_id AND TEMPLATEQUESTION.fk_question_id = $question_id");
 						  $this->db->JOIN(QUESTIONANSWERS.' as QUESTIONANSWERS','TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = QUESTIONANSWERS.question_answer_id');
 						  
-						  $this->db->JOIN(PDANSWER.' as PDANSWER',"QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.fk_pd_id = $pd_id",'LEFT');
+						  $this->db->JOIN(PDANSWER.' as PDANSWER',"QUESTIONANSWERS.question_answer_id = PDANSWER.pd_answer_id AND TEMPLATEANSWERWEIGHTAGE.fk_question_answer_id = PDANSWER.pd_answer_id AND PDANSWER.isactive = 1 AND PDANSWER.fk_pd_id = $pd_id",'LEFT');
 						
 						// $this->db->WHERE('QUESTIONANSWERS.fk_question_id',$question['question_id']);
 						 // $this->db->WHERE('TEMPLATEANSWERWEIGHTAGE.fk_template_question_id',$question_id);
diff --git a/api/application/models/Template_Management_Model.php b/api/application/models/Template_Management_Model.php
index 23dbc813..4c9863d6 100644
--- a/api/application/models/Template_Management_Model.php
+++ b/api/application/models/Template_Management_Model.php
@@ -169,6 +169,7 @@ class Template_Management_Model extends SPARQ_Model {
 				$this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question');
 				$this->db->FROM(QUESTIONS.' as QUESTIONS');
 				$this->db->WHERE('QUESTIONS.fk_question_category',$category_id);
+				$this->db->WHERE('QUESTIONS.isactive',1);
 				$this->db->WHERE_NOT_IN('QUESTIONS.question_id',$temp_array);
 				$questions = $this->db->GET()->result_array();
 				
@@ -207,6 +208,7 @@ class Template_Management_Model extends SPARQ_Model {
 				$this->db->SELECT('QUESTIONS.question_id,QUESTIONS.question');
 				$this->db->FROM(QUESTIONS.' as QUESTIONS');
 				$this->db->WHERE('QUESTIONS.fk_question_category',$category_id);
+				$this->db->WHERE('QUESTIONS.isactive',1);
 				$questions = $this->db->GET()->result_array();