diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
index 4b9ada4f..c3dd2f0f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FormDao.java
@@ -46,7 +46,6 @@ public class FormDao {
         formEntity.setCall(callEntity);
         formEntity.setLabel(formRequest.getLabel());
         formEntity.setContent(setContentResponseBean(formRequest.getContent()));
-        formEntity.setOrderNo(formRequest.getOrderNo());
         formEntity=saveFormEntity(formEntity);
         return formEntity;
     }
@@ -56,7 +55,6 @@ public class FormDao {
         formResponseBean.setContent(Utils.convertJsonStringToList(formEntity.getContent(), ContentResponseBean.class));
         formResponseBean.setLabel(formEntity.getLabel());
         formResponseBean.setCallId(formEntity.getCall().getId());
-        formResponseBean.setOrderNo(formEntity.getOrderNo());
         return formResponseBean;
     }
     public FormResponseBean createForm(Long callId,FormRequest formRequest){
@@ -73,9 +71,6 @@ public class FormDao {
         FormEntity formEntity = formService.getFormEntityById(formId);
         Utils.setIfUpdated(formEntity::getLabel,formEntity::setLabel,formRequest.getLabel());
         Utils.setIfUpdated(formEntity::getContent,formEntity::setContent,setContentResponseBean(formRequest.getContent()));
-        if(formRequest.getOrderNo()!=null && formRequest.getOrderNo() > 0) {
-            Utils.setIfUpdated(formEntity::getOrderNo, formEntity::setOrderNo, formRequest.getOrderNo());
-        }
         formEntity.setUpdatedDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
         formEntity=saveFormEntity(formEntity);
         return convertFormEntityToFormResponseBean(formEntity);
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
index d4a8c5f2..588619a5 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
@@ -23,7 +23,4 @@ public class FormEntity extends BaseEntity{
 
     @Column(name = "CONTENT", length = 255)
     private String content;
-
-    @Column(name = "ORDER_NO")
-    private Integer orderNo;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/FormRequest.java b/src/main/java/net/gepafin/tendermanagement/model/request/FormRequest.java
index af541630..118ec040 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/FormRequest.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/FormRequest.java
@@ -11,6 +11,4 @@ public class FormRequest {
 
     private List<ContentRequestBean> content;
 
-    private Integer orderNo;
-
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/SettingRequestBean.java b/src/main/java/net/gepafin/tendermanagement/model/request/SettingRequestBean.java
index 98db2c59..fc724554 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/request/SettingRequestBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/request/SettingRequestBean.java
@@ -7,5 +7,5 @@ public class SettingRequestBean {
 
     private String name;
 
-    private String value;
+    private Object value;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java
index 3c347901..0be2957d 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/FormResponseBean.java
@@ -15,6 +15,4 @@ public class FormResponseBean {
     private Long callId;
 
     private List<ContentResponseBean> content;
-
-    private Integer orderNo;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/SettingResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/SettingResponseBean.java
index dcddf149..49f208cb 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/SettingResponseBean.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/SettingResponseBean.java
@@ -7,5 +7,5 @@ public class SettingResponseBean {
 
     private String name;
 
-    private String value;
+    private Object value;
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 06b3a98e..07fcf32f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -21,6 +21,7 @@ spring.liquibase.enabled=true
 
 # Swagger Configuration
 springdoc.api-docs.path=/v1/api-docs
+springdoc.swagger-ui.tagsSorter=alpha
 
 
 #aws configuration
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index ad959c40..3e221a3a 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -534,4 +534,10 @@
             </column>
         </addColumn>
     </changeSet>
+    
+ 	<changeSet id="02-09-2024_1" author="Rajesh Khore">
+		<dropColumn tableName="FORM"
+			columnName="order_no" />
+	</changeSet>
+    
 </databaseChangeLog>