diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java
index 4d2ac8923..125a5cc46 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/Xowdir_item_doc.java
@@ -34,7 +34,7 @@ public class Xowdir_item_doc implements Mustache_doc_itm {
 		else if	(String_.Eq(key, "domain"))			bfr.Add_str_u8(domain);
 		else if	(String_.Eq(key, "name"))			bfr.Add_str_u8(name);
 		else if	(String_.Eq(key, "dir"))			bfr.Add_str_u8(dir);
-		else if	(String_.Eq(key, "mainpage"))		bfr.Add_str_u8(main_page);
+		else if	(String_.Eq(key, "main_page"))		bfr.Add_str_u8(main_page);
 		else										return false;
 		return true;
 	}
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xopg_db_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xopg_db_mgr.java
index 674525e9f..95a05247b 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xopg_db_mgr.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xopg_db_mgr.java
@@ -129,6 +129,7 @@ public class Xopg_db_mgr {
 
 		// search_link
 		gplx.xowa.addons.wikis.searchs.dbs.Srch_db_mgr srch_db_mgr = new gplx.xowa.addons.wikis.searchs.dbs.Srch_db_mgr(db_mgr);
+		srch_db_mgr.Init(0);	// NOTE: num_pages doesn't matter for updating links
 		srch_db_mgr.Update_links(ns_id, old_id, new_id);
 		// NOTE: should clear search_results_cache, but for now, update_page_id is only called as a maint proc when wiki is loaded
 
diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java
index a9d6365ec..16aa778bd 100644
--- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java
+++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java
@@ -88,7 +88,11 @@ public class Xow_wiki_upgrade_ {
 			// update page_id if any found
 			int page_ids_len = page_ids_list.Len();
 			if (page_ids_len > 0) {
-				int next_id = db_mgr.Db__core().Tbl__cfg().Select_int(Xowd_cfg_key_.Grp__db, Xowd_cfg_key_.Key__wiki__page__id_next);
+				int next_id = db_mgr.Db__core().Tbl__cfg().Assert_int(Xowd_cfg_key_.Grp__db, Xowd_cfg_key_.Key__wiki__page__id_next, Xowd_page_tbl.INVALID_PAGE_ID);
+				if (next_id == Xowd_page_tbl.INVALID_PAGE_ID) {
+					next_id = db_mgr.Db__core().Conn().Exec_select_max_as_int(Xowd_page_tbl.TBL_NAME, page_tbl.Fld_page_id(), 1);
+					next_id++;
+				}
 				for (int i = 0; i < page_ids_len; i++) {
 					int old_page_id = (int)page_ids_list.Get_at(i);
 					int new_page_id = next_id + i;