diff --git a/cmd/app/config.go b/cmd/app/config.go
index 5861b4b3..dc40dfe2 100644
--- a/cmd/app/config.go
+++ b/cmd/app/config.go
@@ -11,7 +11,7 @@ type PluginOptions struct {
 		GitlabRequest  bool `json:"gitlab_request"`
 		GitlabResponse bool `json:"gitlab_response"`
 	} `json:"debug"`
-	ChosenTargetBranch *string `json:"chosen_target_branch,omitempty"`
+	ChosenMrIID        int `json:"chosen_mr_iid"`
 	ConnectionSettings struct {
 		Insecure bool   `json:"insecure"`
 		Remote   string `json:"remote"`
diff --git a/cmd/app/draft_notes.go b/cmd/app/draft_notes.go
index 42daaa39..4f550537 100644
--- a/cmd/app/draft_notes.go
+++ b/cmd/app/draft_notes.go
@@ -90,7 +90,7 @@ func (a draftNoteService) listDraftNotes(w http.ResponseWriter, r *http.Request)
 
 type PostDraftNoteRequest struct {
 	Comment      string `json:"comment" validate:"required"`
-	DiscussionId string `json:"discussion_id,omitempty" validate:"required"`
+	DiscussionId string `json:"discussion_id,omitempty"`
 	PositionData        // TODO: How to add validations to data from external package???
 }
 
diff --git a/cmd/app/git/git_test.go b/cmd/app/git/git_test.go
index e8864fb2..c2f88045 100644
--- a/cmd/app/git/git_test.go
+++ b/cmd/app/git/git_test.go
@@ -198,7 +198,7 @@ func TestExtractGitInfo_FailToGetProjectRemoteUrl(t *testing.T) {
 	tC := FailTestCase{
 		desc:        "Error returned by function to get the project remote url",
 		errMsg:      "Some error",
-		expectedErr: "Could not get project Url: Some error",
+		expectedErr: "could not get project Url: Some error",
 	}
 	t.Run(tC.desc, func(t *testing.T) {
 		g := failingUrlManager{
@@ -227,7 +227,7 @@ func TestExtractGitInfo_FailToGetCurrentBranchName(t *testing.T) {
 	tC := FailTestCase{
 		desc:        "Error returned by function to get the project remote url",
 		errMsg:      "Some error",
-		expectedErr: "Failed to get current branch: Some error",
+		expectedErr: "failed to get current branch: Some error",
 	}
 	t.Run(tC.desc, func(t *testing.T) {
 		g := failingBranchManager{
diff --git a/cmd/app/middleware.go b/cmd/app/middleware.go
index 5408626b..0549db25 100644
--- a/cmd/app/middleware.go
+++ b/cmd/app/middleware.go
@@ -100,12 +100,17 @@ type withMrMiddleware struct {
 // Gets the current merge request ID and attaches it to the projectInfo
 func (m withMrMiddleware) handle(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
 		// If the merge request is already attached, skip the middleware logic
 		if m.data.projectInfo.MergeId == 0 {
+
 			options := gitlab.ListProjectMergeRequestsOptions{
 				Scope:        gitlab.Ptr("all"),
 				SourceBranch: &m.data.gitInfo.BranchName,
-				TargetBranch: pluginOptions.ChosenTargetBranch,
+			}
+
+			if pluginOptions.ChosenMrIID != 0 {
+				options.IIDs = gitlab.Ptr([]int{pluginOptions.ChosenMrIID})
 			}
 
 			mergeRequests, _, err := m.client.ListProjectMergeRequests(m.data.projectInfo.ProjectId, &options)
diff --git a/lua/gitlab/actions/merge_requests.lua b/lua/gitlab/actions/merge_requests.lua
index b42b94b6..0af9db0c 100644
--- a/lua/gitlab/actions/merge_requests.lua
+++ b/lua/gitlab/actions/merge_requests.lua
@@ -45,7 +45,7 @@ M.choose_merge_request = function(opts)
       end
 
       vim.schedule(function()
-        state.chosen_target_branch = choice.target_branch
+        state.chosen_mr_iid = choice.iid
         require("gitlab.server").restart(function()
           if opts.open_reviewer then
             require("gitlab").review()
diff --git a/lua/gitlab/reviewer/init.lua b/lua/gitlab/reviewer/init.lua
index 9ef37ea2..185c01bc 100644
--- a/lua/gitlab/reviewer/init.lua
+++ b/lua/gitlab/reviewer/init.lua
@@ -145,6 +145,8 @@ M.jump = function(file_name, line_number, new_buffer)
     line_number = number_of_lines
   end
   vim.api.nvim_win_set_cursor(0, { line_number, 0 })
+  u.open_fold_under_cursor()
+  vim.cmd("normal! zz")
 end
 
 ---Get the data from diffview, such as line information and file name. May be used by
diff --git a/lua/gitlab/server.lua b/lua/gitlab/server.lua
index 8efb338a..0b18f020 100644
--- a/lua/gitlab/server.lua
+++ b/lua/gitlab/server.lua
@@ -20,10 +20,10 @@ M.start = function(callback)
     debug = state.settings.debug,
     log_path = state.settings.log_path,
     connection_settings = state.settings.connection_settings,
-    chosen_target_branch = state.chosen_target_branch,
+    chosen_mr_iid = state.chosen_mr_iid,
   }
 
-  state.chosen_target_branch = nil -- Do not let this interfere with subsequent reviewer.open() calls
+  state.chosen_mr_iid = 0 -- Do not let this interfere with subsequent reviewer.open() calls
 
   local settings = vim.json.encode(go_server_settings)
   local command = string.format("%s '%s'", state.settings.bin, settings)
diff --git a/lua/gitlab/state.lua b/lua/gitlab/state.lua
index a6349b50..12686151 100644
--- a/lua/gitlab/state.lua
+++ b/lua/gitlab/state.lua
@@ -251,9 +251,8 @@ M.unlinked_discussion_tree = {
   unresolved_expanded = false,
 }
 
--- Used to set a specific target when choosing a merge request, due to the fact
--- that it's technically possible to have multiple target branches
-M.chosen_target_branch = nil
+-- Used to set a specific MR when choosing a merge request
+M.chosen_mr_iid = 0
 
 -- These keymaps are set globally when the plugin is initialized
 M.set_global_keymaps = function()
diff --git a/lua/gitlab/utils/init.lua b/lua/gitlab/utils/init.lua
index 3018fd44..2729da1a 100644
--- a/lua/gitlab/utils/init.lua
+++ b/lua/gitlab/utils/init.lua
@@ -752,4 +752,10 @@ M.get_nested_field = function(table, field)
   end
 end
 
+M.open_fold_under_cursor = function()
+  if vim.fn.foldclosed(vim.fn.line(".")) > -1 then
+    vim.cmd("normal! zo")
+  end
+end
+
 return M
diff --git a/makefile b/makefile
index 83e9c65f..151ce822 100644
--- a/makefile
+++ b/makefile
@@ -4,10 +4,10 @@ PROJECTNAME=$(shell basename "$(PWD)")
 
 ## compile: build golang project
 compile:
-	@cd cmd && go build -o bin && mv bin ../bin
+	@go build -o bin ./cmd
 ## test: run golang project tests
 test:
-	@cd cmd/app && go test
+	@go test -v ./...
 
 .PHONY: help
 all: help