diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
index 7163f1f6..5ca6eb0e 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FlowFormDao.java
@@ -223,13 +223,12 @@ public class FlowFormDao {
 			NextOrPreviousFormResponse nextOrPreviousFormResponse = new NextOrPreviousFormResponse();
 			nextOrPreviousFormResponse.setNextFormId(getDefaultForm(applicationEntity));
 			return nextOrPreviousFormResponse;
-		}else {
-			fromEntity = Optional
-					.of(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId))
-					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
-							Translator.toLocale(GepafinConstant.FORM_NOT_FOUND)))
-					.getForm();
 		}
+		fromEntity = Optional
+				.of(applicationFormRepository.findByApplicationIdAndFormId(applicationEntity.getId(), formId))
+				.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
+						Translator.toLocale(GepafinConstant.FORM_NOT_FOUND)))
+				.getForm();
 
 		NextOrPreviousFormResponse nextOrPreviousFormResponse = new NextOrPreviousFormResponse();
 		if (action.equals(FormActionEnum.NEXT)) {
diff --git a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java
index 013526ff..e82b7c70 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java
@@ -27,7 +27,7 @@ public interface ApplicationService {
 
     public ApplicationResponse createApplication(HttpServletRequest request, ApplicationRequest applicationRequest, Long callId);
 
-	public NextOrPreviousFormResponse getnextOrPreviousForm(HttpServletRequest request, Long applicationId, Long formId, FormActionEnum action);
+	public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long formId, FormActionEnum action);
 
 	public void updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status);
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
index c0e7b301..e9c524d4 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
@@ -71,7 +71,7 @@ public class ApplicationServiceImpl implements ApplicationService {
     }
     
     @Override
-    public NextOrPreviousFormResponse getnextOrPreviousForm(HttpServletRequest request, Long applicationId, Long formId,
+    public NextOrPreviousFormResponse getNextOrPreviousForm(HttpServletRequest request, Long applicationId, Long formId,
     		FormActionEnum action) {
     	ApplicationEntity applicationEntity = validateApplication(applicationId);
     	return flowFormDao.getnextOrPreviousForm(applicationEntity, formId, action);
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
index 85f6e345..75de91fb 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
@@ -28,7 +28,7 @@ import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 @Validated
 public interface ApplicationApi {
 
-    @Operation(summary = "Api to create or update application",
+    @Operation(summary = "Api to create application form",
             responses = {
                     @ApiResponse(responseCode = "200", description = "OK"),
                     @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -107,10 +107,10 @@ public interface ApplicationApi {
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
     @GetMapping(value = "/{applicationId}/form/next-previous", produces = "application/json")
-    ResponseEntity<Response<NextOrPreviousFormResponse>> getnextOrPreviousForm(HttpServletRequest request,
+    ResponseEntity<Response<NextOrPreviousFormResponse>> getNextOrPreviousForm(HttpServletRequest request,
 					 @Parameter(description = "The applicaltion id", required = true) @PathVariable("applicationId") Long applicationId,
                      @Parameter(description = "The form id", required = false) @RequestParam(value = "formId", required = false) Long formId,
-                     @RequestParam("action") FormActionEnum action);
+                     @RequestParam(value = "action", required = false) FormActionEnum action);
     
     
     @Operation(summary = "Api to update application status",
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java
index 9986412b..ac55c81b 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java
@@ -74,9 +74,9 @@ public class ApplicationApiController implements ApplicationApi {
     }
     
     @Override
-    public ResponseEntity<Response<NextOrPreviousFormResponse>> getnextOrPreviousForm(HttpServletRequest request,Long applicationId,
+    public ResponseEntity<Response<NextOrPreviousFormResponse>> getNextOrPreviousForm(HttpServletRequest request,Long applicationId,
     		Long formId, FormActionEnum action) {
-    	NextOrPreviousFormResponse data = applicationService.getnextOrPreviousForm(request, applicationId, formId, action);
+    	NextOrPreviousFormResponse data = applicationService.getNextOrPreviousForm(request, applicationId, formId, action);
     	log.info("Get Next Or Previous Form ");
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new Response<>(data, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG)));