diff --git a/data/core/commands/core.lua b/data/core/commands/core.lua
index e836ea2f..62be4bc6 100644
--- a/data/core/commands/core.lua
+++ b/data/core/commands/core.lua
@@ -9,7 +9,8 @@ local fullscreen = false
 
 local function suggest_directory(text)
   text = common.home_expand(text)
-  return common.home_encode_list(text == "" and core.recent_projects or common.dir_path_suggest(text))
+  return common.home_encode_list((text == "" or text == common.home_expand(common.dirname(core.project_dir))) 
+    and core.recent_projects or common.dir_path_suggest(text))
 end
 
 command.add(nil, {
@@ -149,7 +150,7 @@ command.add(nil, {
   ["core:change-project-folder"] = function()
     local dirname = common.dirname(core.project_dir)
     if dirname then
-      core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
+      core.command_view:set_text(common.home_encode(dirname))
     end
     core.command_view:enter("Change Project Folder", function(text, item)
       text = system.absolute_path(common.home_expand(item and item.text or text))
@@ -166,7 +167,7 @@ command.add(nil, {
   ["core:open-project-folder"] = function()
     local dirname = common.dirname(core.project_dir)
     if dirname then
-      core.command_view:set_text(common.home_encode(dirname) .. PATHSEP)
+      core.command_view:set_text(common.home_encode(dirname))
     end
     core.command_view:enter("Open Project", function(text, item)
       text = common.home_expand(item and item.text or text)
diff --git a/data/core/doc/highlighter.lua b/data/core/doc/highlighter.lua
index 4cb703da..c77e1138 100644
--- a/data/core/doc/highlighter.lua
+++ b/data/core/doc/highlighter.lua
@@ -52,7 +52,7 @@ end
 function Highlighter:insert_notify(line, n)
   self:invalidate(line)
   for i = 1, n do
-    table.insert(self.lines, line, nil)
+    table.insert(self.lines, line, false)
   end
 end
 
diff --git a/data/core/doc/search.lua b/data/core/doc/search.lua
index b4c553c9..8395769a 100644
--- a/data/core/doc/search.lua
+++ b/data/core/doc/search.lua
@@ -43,6 +43,7 @@ end
 
 function search.find(doc, line, col, text, opt)
   doc, line, col, text, opt = init_args(doc, line, col, text, opt)
+  local plain = not opt.pattern
   local pattern = text
   local search_func = string.find
   if opt.regex then
@@ -60,9 +61,9 @@ function search.find(doc, line, col, text, opt)
     end
     local s, e
     if opt.reverse then
-      s, e = rfind(search_func, line_text, pattern, col - 1)
+      s, e = rfind(search_func, line_text, pattern, col - 1, plain)
     else
-      s, e = search_func(line_text, pattern, col)
+      s, e = search_func(line_text, pattern, col, plain)
     end
     if s then
       return line, s, line, e + 1
diff --git a/data/core/rootview.lua b/data/core/rootview.lua
index 04a091c4..51eedc10 100644
--- a/data/core/rootview.lua
+++ b/data/core/rootview.lua
@@ -149,10 +149,17 @@ function Node:remove_view(root, view)
     else
       locked_size = locked_size_y
     end
-    if self.is_primary_node or locked_size then
+    local next_primary
+    if self.is_primary_node then
+      next_primary = core.root_view:select_next_primary_node()
+    end
+    if locked_size or (self.is_primary_node and not next_primary) then
       self.views = {}
       self:add_view(EmptyView())
     else
+      if other == next_primary then
+        next_primary = parent
+      end
       parent:consume(other)
       local p = parent
       while p.type ~= "leaf" do
@@ -160,7 +167,7 @@ function Node:remove_view(root, view)
       end
       p:set_active_view(p.active_view)
       if self.is_primary_node then
-        p.is_primary_node = true
+        next_primary.is_primary_node = true
       end
     end
   end
@@ -823,6 +830,24 @@ function RootView:get_primary_node()
 end
 
 
+local function select_next_primary_node(node)
+  if node.is_primary_node then return end
+  if node.type ~= "leaf" then
+    return select_next_primary_node(node.a) or select_next_primary_node(node.b)
+  else
+    local lx, ly = node:get_locked_size()
+    if not lx and not ly then
+      return node
+    end
+  end
+end
+
+
+function RootView:select_next_primary_node()
+  return select_next_primary_node(self.root_node)
+end
+
+
 function RootView:open_doc(doc)
   local node = self:get_active_node_default()
   for i, view in ipairs(node.views) do
diff --git a/data/core/syntax.lua b/data/core/syntax.lua
index a763ac78..de8ec9d0 100644
--- a/data/core/syntax.lua
+++ b/data/core/syntax.lua
@@ -22,7 +22,7 @@ end
 
 function syntax.get(filename, header)
   return find(filename, "files")
-      or find(header, "headers")
+      or (header and find(header, "headers"))
       or plain_text_syntax
 end
 
diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua
index d08db03e..77b6732f 100644
--- a/data/plugins/treeview.lua
+++ b/data/plugins/treeview.lua
@@ -225,6 +225,9 @@ function TreeView:on_mouse_pressed(button, x, y, clicks)
     end
   else
     core.try(function()
+      if core.last_active_view and core.active_view == self then
+        core.set_active_view(core.last_active_view)
+      end
       local doc_filename = core.normalize_to_project_dir(hovered_item.abs_filename)
       core.root_view:open_doc(core.open_doc(doc_filename))
     end)
diff --git a/scripts/package.sh b/scripts/package.sh
index 1370aee8..21a8cc91 100644
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -186,7 +186,7 @@ main() {
 
   rm -rf "${dest_dir}"
 
-  DESTDIR="$(pwd)/${dest_dir}" meson install -C "${build_dir}"
+  DESTDIR="$(pwd)/${dest_dir}" meson install --skip-subprojects -C "${build_dir}"
 
   local data_dir="$(pwd)/${dest_dir}/data"
   local exe_file="$(pwd)/${dest_dir}/lite-xl"