diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl_visitor.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl_visitor.java
index 4992e6d52..506f1f887 100644
--- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl_visitor.java
+++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl_visitor.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2020 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
@@ -79,8 +79,8 @@ public class Scrib_lib_wikibase_srl_visitor implements Wbase_claim_visitor {
 		Keyval[] rv = new Keyval[4];
 		rv[0] = Keyval_.new_(Wbase_claim_quantity_.Itm__amount.Key_str()			, itm.Amount_as_num().To_str());	// NOTE: must be num b/c Module code will directly do math calc on it; EX: "99" not "+99"; PAGE:eo.w:Mud�; DATE:2015-11-08
 		rv[1] = Keyval_.new_(Wbase_claim_quantity_.Itm__unit.Key_str()				, String_.new_u8(itm.Unit()));
-		rv[2] = Keyval_.new_(Wbase_claim_quantity_.Itm__upperbound.Key_str()		, itm.Ubound_as_num().To_str());
-		rv[3] = Keyval_.new_(Wbase_claim_quantity_.Itm__lowerbound.Key_str()		, itm.Lbound_as_num().To_str());
+		rv[2] = Keyval_.new_(Wbase_claim_quantity_.Itm__upperbound.Key_str()		, itm.Ubound_as_num() == null ? null : itm.Ubound_as_num().To_str());
+		rv[3] = Keyval_.new_(Wbase_claim_quantity_.Itm__lowerbound.Key_str()		, itm.Lbound_as_num() == null ? null : itm.Lbound_as_num().To_str());
 		return rv;
 	}
 	public void Visit_time(Wbase_claim_time itm) {
diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/wikibases/Basic__tst.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/wikibases/Basic__tst.java
index e3e294cf5..73e05f573 100644
--- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/wikibases/Basic__tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/wikibases/Basic__tst.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2017 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
@@ -13,338 +13,357 @@ The terms of each license can be found in the source code repository:
 GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
 Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
-package gplx.xowa.xtns.scribunto.libs.wikibases; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.libs.*;
-import org.junit.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.itms.*;
-import gplx.xowa.xtns.wbases.claims.enums.*;
-public class Basic__tst {
-	private final    Scrib_invoke_func_fxt fxt = new Scrib_invoke_func_fxt(); private Scrib_lib lib;
-	private final    Wdata_wiki_mgr_fxt wdata_fxt = new Wdata_wiki_mgr_fxt();
-	@Before public void init() {
-		fxt.Clear_for_lib("en.wikipedia.org", "zh-hans");
-		lib = fxt.Core().Lib_wikibase().Init();
-		wdata_fxt.Init(fxt.Parser_fxt(), false);
-		wdata_fxt.Init_lang_fallbacks("zh-hant", "zh-hk");
-	}
-	@Test  public void IsValidEntityId() {
-		IsValidEntityIdCheck(Bool_.Y, "P1");
-		IsValidEntityIdCheck(Bool_.Y, "P123");
-		IsValidEntityIdCheck(Bool_.Y, "Q1");
-		IsValidEntityIdCheck(Bool_.Y, "Q123");
-		IsValidEntityIdCheck(Bool_.Y, "A:B:Q123");
-
-		IsValidEntityIdCheck(Bool_.N, "p1");
-		IsValidEntityIdCheck(Bool_.N, "q1");
-		IsValidEntityIdCheck(Bool_.N, "P");
-		IsValidEntityIdCheck(Bool_.N, "P1A");
-		IsValidEntityIdCheck(Bool_.N, "P01");
-	}
-	private void IsValidEntityIdCheck(boolean expd, String val) {
-		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_isValidEntityId, Object_.Ary(val), expd);
-	}
-	@Test  public void EntityExists() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
-		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_entityExists, Object_.Ary("q2"					), true);
-		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_entityExists, Object_.Ary("Q1"					), false);
-	}
-	@Test  public void GetEntityId() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc("Q2")
-			.Add_sitelink("enwiki", "Earth")
-			);
-
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary("Earth"							), "Q2");
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary("missing_page"					), null);
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary(""								), null); // PAGE:en.w:Water_treader DATE:2018-07-01
-	}
-	@Test  public void GetReferencedEntityId() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q1").Xto_wdoc());
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q2").Add_claims(wdata_fxt.Make_claim_entity_qid(1, 1)).Xto_wdoc());
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q3").Add_claims(wdata_fxt.Make_claim_entity_qid(1, 2)).Xto_wdoc());
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getReferencedEntityId, Object_.Ary("Q3", "P1", NewToIds("Q1")), "Q1");
-	}
-	private static Keyval[] NewToIds(String... toIds) {
-		int len = toIds.length;
-		Keyval[] rv = new Keyval[len];
-		for (int i = 0; i < len; i++)
-			rv[i] = Keyval_.int_(i, toIds[i]);
-		return rv;
-	}
-	@Test  public void GetLabel__cur() {// do not get fallback
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hans", "s").Add_label("zh-hant", "t").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=s", "2=zh-hans"));
-	}
-	@Test  public void GetLabel__fallback_1() { // get 1st fallback
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hant", "t").Add_label("zh-hk", "h").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=t", "2=zh-hant"));
-	}
-	@Test  public void GetLabel__fallback_2() {// get 2nd fallback
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hk", "hk").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=hk", "2=zh-hk"));
-	}
-	@Test  public void GetLabel__fallback_en() {// get en
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "lbl_en").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=lbl_en", "2=en"));
-	}
-	@Test  public void GetDescr() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_description("zh-hans", "s").Add_description("zh-hant", "t").Xto_wdoc());
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getDescription, Object_.Ary("q2"), "s");
-	}
-	@Test  public void GetSlink() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_sitelink("enwiki", "a").Xto_wdoc());
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2"), "a");
-	}
-	@Test  public void GetEntity() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("q2", false), String_.Concat_lines_nl_skip_last
-		( "1="
-		, "  id=q2"
-		, "  type=item"
-		, "  schemaVersion=2"
-		, "  labels="
-		, "    en="
-		, "      language=en"
-		, "      value=b"
-		));
-	}
-	@Test  public void GetEntity_property() {	// PURPOSE: getEntity should be able to convert "p2" to "Property:P2"; EX:es.w:Arnold_Gesell; DATE:2014-02-18
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Property:p2").Add_label("en", "b").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("p2", false), String_.Concat_lines_nl_skip_last
-		( "1="
-		, "  id=Property:p2"	// only difference from above
-		, "  type=property"		// also, type should be "property"; PAGE:ru.w:Викитека:Проект:Викиданные DATE:2016-11-23
-		, "  schemaVersion=2"
-		, "  datatype=<<NULL>>"
-		, "  labels="
-		, "    en="
-		, "      language=en"
-		, "      value=b"
-		));
-	}
-	@Test  public void GetEntity_ws() {  // PURPOSE: trim, b/c some pages will literally pass in "Property:P5\n"; PAGE:de.w:Mailand–Sanremo_2016 ISSUE#:363; DATE:2019-02-12
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
-		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary(" q2\n\t", false), String_.Concat_lines_nl_skip_last
-		( "1="
-		, "  id=q2"
-		, "  type=item"
-		, "  schemaVersion=2"
-		, "  labels="
-		, "    en="
-		, "      language=en"
-		, "      value=b"
-		));
-	}
-//		@Test  public void GetEntity__missing() { // PURPOSE: missing entity should return empty kv array; PAGE:de.w:Critérium_International_2016 DATE:2017-12-30
-//			fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("q2", false), String_.Concat_lines_nl_skip_last
-//			( "1=" // not ""
-//			));
-//		}
-	@Test  public void RenderSnaks() {
-		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
-	}
-	@Test  public void RenderSnaks_pid() { // PURPOSE: handle RenderSnaks like {"P10":[{"property":"P20"}]}; ISSUE#:666; DATE:2020-03-01
-		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_nde(wdata_fxt, "P123", wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
-	}
-	@Test  public void RenderSnak__entity() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q3").Add_label("en", "test_label").Xto_wdoc());
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_entity_qid(2, 3));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "test_label");
-	}
-	@Test  public void RenderSnak__str() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_string(3, "test_str"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "test_str");
-	}
-	@Test  public void RenderSnak__quantity() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_quantity(3, "123", "1", "125", "121"));	// NOTE: entity-less units output "1"; EX:wd:Q493409 DATE:2016-11-08
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "123±2");
-	}
-	@Test  public void RenderSnak__quantity__null_bounds() {	// PURPOSE: handle null lbound / ubound; PAGE:wd.q:183 DATE:2016-12-03
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_quantity(3, "123", "1", null, null));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "123");
-	}
-	@Test  public void RenderSnak__time() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_time(3, "2012-01-02 03:04:05"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "30405 2 Jan 2012"); // NOTE: format is missing ":" b/c test does not init messages for html_wtr;  DATE:2015-08-03
-	}
-	@Test  public void RenderSnak__geo() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_geo(3, "3.4", "1.2"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "1°12&#39;0&#34;N, 3°24&#39;0&#34;E (<a href='/wiki/Q2'>http://www.wikidata.org/entity/Q2</a>)");
-	}
-	@Test  public void RenderSnak__monolingual() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "abc_en"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "abc_en");
-	}
-	@Test  public void RenderSnak__no_value() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__novalue, null));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
-	}
-	@Test  public void RenderSnak__data_value_is_null() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
-	}
-	@Test  public void RenderSnak__data_value_is_null1() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
-	}
-	@Test  public void FormatValues() {
-		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_formatValues, args, "P3_en, P3_de");
-	}
-	@Test  public void FormatValue__str() {
-		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_string(3, "test_str"));
-		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_formatValue, args, "test_str");
-	}
-	@Test  public void GetEntityUrl() {
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityUrl, Object_.Ary("Q2"							), "https://www.wikidata.org/wiki/Special:EntityPage/Q2");
-	}
-	@Test  public void GetSetting() {
-		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getSetting, Object_.Ary("allowArbitraryDataAccess"), true); // PAGE:en.w:Beccles DATE:2018-06-27
-	}
-	@Test  public void GetSetting__siteGlobalID() {
-		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getSetting, Object_.Ary("siteGlobalID"), "enwiki");
-	}
-	@Test  public void IncrementStatsKey() {
-		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_incrementStatsKey, Object_.Ary("wikibase.client.scribunto.wikibase.getEntityIdForCurrentPage.call"), null);
-	}
-	@Test  public void GetEntityModuleName() {
-		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getEntityModuleName, Object_.Ary("Q123"), "mw.wikibase.entity");
-	}
-	@Test  public void GetSiteLinkPageName() {
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_sitelink("enwiki", "Test_page").Xto_wdoc());
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2"), "Test_page");
-	}
-	@Test  public void GetSiteLinkPageName_wiki() {// ISSUE#:665; PAGE:commons.wikimedia.org/wiki/Category:Paddy_Ashdown; DATE:2020-02-19
-		wdata_fxt.Init_xwikis_add("frwiki");
-		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2")
-			.Add_sitelink("enwiki", "q2_enwiki")
-			.Add_sitelink("frwiki", "q2_frwiki")
-			.Xto_wdoc());
-		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2", "frwiki"), "q2_frwiki"); // fails if q2_enwiki
-	}
-}
-class Wbase_snak_utl_ {
-	public static Keyval[] Get_snaks_as_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
-		Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
-		return To_scrib_args(rv); // EX: ["1":["1":{"property":"P1"},"2":{"property":"P2"}]]
-	}
-	public static Keyval[] Get_snaks_as_nde(Wdata_wiki_mgr_fxt wdata_fxt, String pid, Wbase_claim_base... ary) {
-		Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
-		Keyval kv = Keyval_.new_(pid, rv); // EX: "P1":[{"property":"P2"}]
-		return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]} // FOOTNOTE:references.snaks
-	}
-	private static Keyval[] To_scrib_args(Object arg) {
-		Keyval[] rv = new Keyval[1];
-		rv[0] = Keyval_.int_(0 + Scrib_core.Base_1, arg);
-		return rv;
-	}
-	private static Keyval[] Get_snaks_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
-		// use wdoc_bldr to create claims
-		Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(ary).Xto_wdoc();
-
-		// extract snaks from claims;
-		return Get_snaks(wdata_fxt, wdoc);
-	}
-	public static Keyval[] Get_snak(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base itm) {
-		Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(itm).Xto_wdoc();
-		Keyval[] snak_props = Get_subs_by_path(Get_snaks(wdata_fxt, wdoc), 0);
-		return Keyval_.Ary(Keyval_.int_(1, snak_props));
-	}
-	private static Keyval[] Get_snaks(Wdata_wiki_mgr_fxt wdata_fxt, Wdata_doc wdoc) {
-		Keyval[] wdoc_root = Scrib_lib_wikibase_srl.Srl(wdata_fxt.Wdata_mgr().Prop_mgr(), wdoc, false, false, Bry_.new_u8("Test_page"));
-		Keyval[] snaks = Get_subs_by_path(wdoc_root, 0, 0);
-		int snaks_len = snaks.length;
-		Keyval[] rv = new Keyval[snaks_len];
-		for (int i = 0; i < snaks_len; ++i) {
-			rv[i] = Keyval_.int_(i + List_adp_.Base1, Get_subs_by_path(snaks, i, 1));
-		}
-		return rv;
-	}
-	private static Keyval[] Get_subs_by_path(Keyval[] root, int... levels) {
-		int len = levels.length;
-		Keyval[] rv = root;
-		for (int i = 0; i < len; ++i) {
-			int idx = levels[i];
-			rv = (Keyval[])rv[idx].Val();
-		}
-		return rv;
-	}
-}
-/*
-==FOOTNOTE:references.snaks==
-Explaining this snippet:
-
-<pre>
-return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]}
-</pre>
-
-* This occurs as a result of https://ja.wikipedia.org/wiki/Sed_(コンピュータ)
-* It has an Infobox which will eventually call this https://ja.wikipedia.org/wiki/Module:WikidataIB
-
-<pre>
-local sourced = function(claim)
-	if claim.references then
-		for kr, vr in pairs(claim.references) do
-			local ref = mw.wikibase.renderSnaks(vr.snaks)
-			if not ref:find("Wikipedia") then
-				return true
-			end
-		end
-	end
-end
-<pre>
-
-Checking then with https:/www.wikidata.org/wiki/Property:P3966
-<pre>
-, "references":
-    [
-    { "hash":"fa278ebfc458360e5aed63d5058cca83c46134f1"
-    , "snaks":
-        { "P143":
-        [
-            { "snaktype":"value"
-            , "property":"P143"
-            , "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
-            , "datavalue":
-            { "value":
-                { "entity-type":"item"
-                , "numeric-id":328
-                , "id":"Q328"
-                }
-            , "type":"wikibase-entityid"
-            }
-            }
-        ]
-        }
-    , "snaks-order":
-        [ "P143"
-        ]
-    }
-    ]
-}
-</pre>
-
-That means claims.references.snaks is this
-<pre>
-        { "P143":
-        [
-            { "snaktype":"value"
-            , "property":"P143"
-            , "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
-            , "datavalue":
-            { "value":
-                { "entity-type":"item"
-                , "numeric-id":328
-                , "id":"Q328"
-                }
-            , "type":"wikibase-entityid"
-            }
-            }
-        ]
-        }
-</pre>
-
-Now, going back to "To_scrib_args(Keyval_.Ary(kv))"
-* "kv" represents "P1":[{"property":"P11"}
-* "kv" gets wrapped in Keyval_.Ary b/c SnakDeserialization will deserialize into key/val pairs; '{"P1":[{"property":"P11"}]}' '["P1":[["property":"P11"]]]'
-* "To_scrib_args()"  will put the entire thing as '["1":...]'
+package gplx.xowa.xtns.scribunto.libs.wikibases;
+
+import gplx.Bool_;
+import gplx.Bry_;
+import gplx.Keyval;
+import gplx.Keyval_;
+import gplx.List_adp_;
+import gplx.Object_;
+import gplx.String_;
+import gplx.xowa.xtns.scribunto.Scrib_core;
+import gplx.xowa.xtns.scribunto.Scrib_invoke_func_fxt;
+import gplx.xowa.xtns.scribunto.Scrib_lib;
+import gplx.xowa.xtns.scribunto.libs.Scrib_lib_wikibase;
+import gplx.xowa.xtns.scribunto.libs.Scrib_lib_wikibase_srl;
+import gplx.xowa.xtns.wbases.Wdata_doc;
+import gplx.xowa.xtns.wbases.Wdata_wiki_mgr_fxt;
+import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_;
+import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base;
+import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_string;
+import org.junit.Before;
+import org.junit.Test;
+
+public class Basic__tst {
+	private final Scrib_invoke_func_fxt fxt = new Scrib_invoke_func_fxt(); private Scrib_lib lib;
+	private final Wdata_wiki_mgr_fxt wdata_fxt = new Wdata_wiki_mgr_fxt();
+	@Before public void init() {
+		fxt.Clear_for_lib("en.wikipedia.org", "zh-hans");
+		lib = fxt.Core().Lib_wikibase().Init();
+		wdata_fxt.Init(fxt.Parser_fxt(), false);
+		wdata_fxt.Init_lang_fallbacks("zh-hant", "zh-hk");
+	}
+	@Test public void IsValidEntityId() {
+		IsValidEntityIdCheck(Bool_.Y, "P1");
+		IsValidEntityIdCheck(Bool_.Y, "P123");
+		IsValidEntityIdCheck(Bool_.Y, "Q1");
+		IsValidEntityIdCheck(Bool_.Y, "Q123");
+		IsValidEntityIdCheck(Bool_.Y, "A:B:Q123");
+
+		IsValidEntityIdCheck(Bool_.N, "p1");
+		IsValidEntityIdCheck(Bool_.N, "q1");
+		IsValidEntityIdCheck(Bool_.N, "P");
+		IsValidEntityIdCheck(Bool_.N, "P1A");
+		IsValidEntityIdCheck(Bool_.N, "P01");
+	}
+	private void IsValidEntityIdCheck(boolean expd, String val) {
+		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_isValidEntityId, Object_.Ary(val), expd);
+	}
+	@Test public void EntityExists() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
+		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_entityExists, Object_.Ary("q2"					), true);
+		fxt.Test_scrib_proc_bool(lib, Scrib_lib_wikibase.Invk_entityExists, Object_.Ary("Q1"					), false);
+	}
+	@Test public void GetEntityId() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc("Q2")
+			.Add_sitelink("enwiki", "Earth")
+			);
+
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary("Earth"							), "Q2");
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary("missing_page"					), null);
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityId, Object_.Ary(""								), null); // PAGE:en.w:Water_treader DATE:2018-07-01
+	}
+	@Test public void GetReferencedEntityId() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q1").Xto_wdoc());
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q2").Add_claims(wdata_fxt.Make_claim_entity_qid(1, 1)).Xto_wdoc());
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q3").Add_claims(wdata_fxt.Make_claim_entity_qid(1, 2)).Xto_wdoc());
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getReferencedEntityId, Object_.Ary("Q3", "P1", NewToIds("Q1")), "Q1");
+	}
+	private static Keyval[] NewToIds(String... toIds) {
+		int len = toIds.length;
+		Keyval[] rv = new Keyval[len];
+		for (int i = 0; i < len; i++)
+			rv[i] = Keyval_.int_(i, toIds[i]);
+		return rv;
+	}
+	@Test public void GetLabel__cur() {// do not get fallback
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hans", "s").Add_label("zh-hant", "t").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=s", "2=zh-hans"));
+	}
+	@Test public void GetLabel__fallback_1() { // get 1st fallback
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hant", "t").Add_label("zh-hk", "h").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=t", "2=zh-hant"));
+	}
+	@Test public void GetLabel__fallback_2() {// get 2nd fallback
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("zh-hk", "hk").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=hk", "2=zh-hk"));
+	}
+	@Test public void GetLabel__fallback_en() {// get en
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "lbl_en").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getLabel, Object_.Ary("q2"), String_.Concat_lines_nl_skip_last("1=lbl_en", "2=en"));
+	}
+	@Test public void GetDescr() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_description("zh-hans", "s").Add_description("zh-hant", "t").Xto_wdoc());
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getDescription, Object_.Ary("q2"), "s");
+	}
+	@Test public void GetSlink() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_sitelink("enwiki", "a").Xto_wdoc());
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2"), "a");
+	}
+	@Test public void GetEntity() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("q2", false), String_.Concat_lines_nl_skip_last
+		( "1="
+		, "  id=q2"
+		, "  type=item"
+		, "  schemaVersion=2"
+		, "  labels="
+		, "    en="
+		, "      language=en"
+		, "      value=b"
+		));
+	}
+	@Test public void GetEntity_property() {	// PURPOSE: getEntity should be able to convert "p2" to "Property:P2"; EX:es.w:Arnold_Gesell; DATE:2014-02-18
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Property:p2").Add_label("en", "b").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("p2", false), String_.Concat_lines_nl_skip_last
+		( "1="
+		, "  id=Property:p2"	// only difference from above
+		, "  type=property"		// also, type should be "property"; PAGE:ru.w:Викитека:Проект:Викиданные DATE:2016-11-23
+		, "  schemaVersion=2"
+		, "  datatype=<<NULL>>"
+		, "  labels="
+		, "    en="
+		, "      language=en"
+		, "      value=b"
+		));
+	}
+	@Test public void GetEntity_ws() {  // PURPOSE: trim, b/c some pages will literally pass in "Property:P5\n"; PAGE:de.w:Mailand–Sanremo_2016 ISSUE#:363; DATE:2019-02-12
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_label("en", "b").Xto_wdoc());
+		fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary(" q2\n\t", false), String_.Concat_lines_nl_skip_last
+		( "1="
+		, "  id=q2"
+		, "  type=item"
+		, "  schemaVersion=2"
+		, "  labels="
+		, "    en="
+		, "      language=en"
+		, "      value=b"
+		));
+	}
+//		@Test public void GetEntity__missing() { // PURPOSE: missing entity should return empty kv array; PAGE:de.w:Critérium_International_2016 DATE:2017-12-30
+//			fxt.Test_scrib_proc_str_ary(lib, Scrib_lib_wikibase.Invk_getEntity, Object_.Ary("q2", false), String_.Concat_lines_nl_skip_last
+//			( "1=" // not ""
+//			));
+//		}
+	@Test public void RenderSnaks() {
+		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
+	}
+	@Test public void RenderSnaks_pid() { // PURPOSE: handle RenderSnaks like {"P10":[{"property":"P20"}]}; ISSUE#:666; DATE:2020-03-01
+		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_nde(wdata_fxt, "P123", wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnaks, args, "P3_en, P3_de");
+	}
+	@Test public void RenderSnak__entity() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("Q3").Add_label("en", "test_label").Xto_wdoc());
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_entity_qid(2, 3));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "test_label");
+	}
+	@Test public void RenderSnak__str() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_string(3, "test_str"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "test_str");
+	}
+	@Test public void RenderSnak__quantity() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_quantity(3, "123", "1", "125", "121"));	// NOTE: entity-less units output "1"; EX:wd:Q493409 DATE:2016-11-08
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "123±2");
+	}
+	@Test public void RenderSnak__quantity__null_bounds() {	// PURPOSE: handle null lbound / ubound; PAGE:wd.q:183 DATE:2016-12-03
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_quantity(3, "123", "1", null, null));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "123");
+	}
+	@Test public void RenderSnak__time() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_time(3, "2012-01-02 03:04:05"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "30405 2 Jan 2012"); // NOTE: format is missing ":" b/c test does not init messages for html_wtr;  DATE:2015-08-03
+	}
+	@Test public void RenderSnak__geo() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_geo(3, "3.4", "1.2"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "1°12&#39;0&#34;N, 3°24&#39;0&#34;E (<a href='/wiki/Q2'>http://www.wikidata.org/entity/Q2</a>)");
+	}
+	@Test public void RenderSnak__monolingual() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "abc_en"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "abc_en");
+	}
+	@Test public void RenderSnak__no_value() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__novalue, null));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
+	}
+	@Test public void RenderSnak__data_value_is_null() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
+	}
+	@Test public void RenderSnak__data_value_is_null1() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, new Wbase_claim_string(3, Wbase_claim_value_type_.Tid__somevalue, null));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_renderSnak, args, "");
+	}
+	@Test public void FormatValues() {
+		Keyval[] args = Wbase_snak_utl_.Get_snaks_as_ary(wdata_fxt, wdata_fxt.Make_claim_monolingual(3, "en", "P3_en"), wdata_fxt.Make_claim_monolingual(3, "de", "P3_de"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_formatValues, args, "P3_en, P3_de");
+	}
+	@Test public void FormatValue__str() {
+		Keyval[] args = Wbase_snak_utl_.Get_snak(wdata_fxt, wdata_fxt.Make_claim_string(3, "test_str"));
+		fxt.Test__proc__kvps__flat(lib, Scrib_lib_wikibase.Invk_formatValue, args, "test_str");
+	}
+	@Test public void GetEntityUrl() {
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getEntityUrl, Object_.Ary("Q2"							), "https://www.wikidata.org/wiki/Special:EntityPage/Q2");
+	}
+	@Test public void GetSetting() {
+		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getSetting, Object_.Ary("allowArbitraryDataAccess"), true); // PAGE:en.w:Beccles DATE:2018-06-27
+	}
+	@Test public void GetSetting__siteGlobalID() {
+		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getSetting, Object_.Ary("siteGlobalID"), "enwiki");
+	}
+	@Test public void IncrementStatsKey() {
+		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_incrementStatsKey, Object_.Ary("wikibase.client.scribunto.wikibase.getEntityIdForCurrentPage.call"), null);
+	}
+	@Test public void GetEntityModuleName() {
+		fxt.Test_scrib_proc_obj(lib, Scrib_lib_wikibase.Invk_getEntityModuleName, Object_.Ary("Q123"), "mw.wikibase.entity");
+	}
+	@Test public void GetSiteLinkPageName() {
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2").Add_sitelink("enwiki", "Test_page").Xto_wdoc());
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2"), "Test_page");
+	}
+	@Test public void GetSiteLinkPageName_wiki() {// ISSUE#:665; PAGE:commons.wikimedia.org/wiki/Category:Paddy_Ashdown; DATE:2020-02-19
+		wdata_fxt.Init_xwikis_add("frwiki");
+		wdata_fxt.Init__docs__add(wdata_fxt.Wdoc_bldr("q2")
+			.Add_sitelink("enwiki", "q2_enwiki")
+			.Add_sitelink("frwiki", "q2_frwiki")
+			.Xto_wdoc());
+		fxt.Test_scrib_proc_str(lib, Scrib_lib_wikibase.Invk_getSiteLinkPageName, Object_.Ary("q2", "frwiki"), "q2_frwiki"); // fails if q2_enwiki
+	}
+}
+class Wbase_snak_utl_ {
+	public static Keyval[] Get_snaks_as_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
+		Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
+		return To_scrib_args(rv); // EX: ["1":["1":{"property":"P1"},"2":{"property":"P2"}]]
+	}
+	public static Keyval[] Get_snaks_as_nde(Wdata_wiki_mgr_fxt wdata_fxt, String pid, Wbase_claim_base... ary) {
+		Keyval[] rv = Get_snaks_ary(wdata_fxt, ary);
+		Keyval kv = Keyval_.new_(pid, rv); // EX: "P1":[{"property":"P2"}]
+		return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]} // FOOTNOTE:references.snaks
+	}
+	private static Keyval[] To_scrib_args(Object arg) {
+		Keyval[] rv = new Keyval[1];
+		rv[0] = Keyval_.int_(0 + Scrib_core.Base_1, arg);
+		return rv;
+	}
+	private static Keyval[] Get_snaks_ary(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base... ary) {
+		// use wdoc_bldr to create claims
+		Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(ary).Xto_wdoc();
+
+		// extract snaks from claims;
+		return Get_snaks(wdata_fxt, wdoc);
+	}
+	public static Keyval[] Get_snak(Wdata_wiki_mgr_fxt wdata_fxt, Wbase_claim_base itm) {
+		Wdata_doc wdoc = wdata_fxt.Wdoc_bldr("q2").Add_claims(itm).Xto_wdoc();
+		Keyval[] snak_props = Get_subs_by_path(Get_snaks(wdata_fxt, wdoc), 0);
+		return Keyval_.Ary(Keyval_.int_(1, snak_props));
+	}
+	private static Keyval[] Get_snaks(Wdata_wiki_mgr_fxt wdata_fxt, Wdata_doc wdoc) {
+		Keyval[] wdoc_root = Scrib_lib_wikibase_srl.Srl(wdata_fxt.Wdata_mgr().Prop_mgr(), wdoc, false, false, Bry_.new_u8("Test_page"));
+		Keyval[] snaks = Get_subs_by_path(wdoc_root, 0, 0);
+		int snaks_len = snaks.length;
+		Keyval[] rv = new Keyval[snaks_len];
+		for (int i = 0; i < snaks_len; ++i) {
+			rv[i] = Keyval_.int_(i + List_adp_.Base1, Get_subs_by_path(snaks, i, 1));
+		}
+		return rv;
+	}
+	private static Keyval[] Get_subs_by_path(Keyval[] root, int... levels) {
+		int len = levels.length;
+		Keyval[] rv = root;
+		for (int i = 0; i < len; ++i) {
+			int idx = levels[i];
+			rv = (Keyval[])rv[idx].Val();
+		}
+		return rv;
+	}
+}
+/*
+==FOOTNOTE:references.snaks==
+Explaining this snippet:
+
+<pre>
+return To_scrib_args(Keyval_.Ary(kv)); // EX:["1":[{"P1":[{"property":"P11"}]]}
+</pre>
+
+* This occurs as a result of https://ja.wikipedia.org/wiki/Sed_(コンピュータ)
+* It has an Infobox which will eventually call this https://ja.wikipedia.org/wiki/Module:WikidataIB
+
+<pre>
+local sourced = function(claim)
+	if claim.references then
+		for kr, vr in pairs(claim.references) do
+			local ref = mw.wikibase.renderSnaks(vr.snaks)
+			if not ref:find("Wikipedia") then
+				return true
+			end
+		end
+	end
+end
+<pre>
+
+Checking then with https:/www.wikidata.org/wiki/Property:P3966
+<pre>
+, "references":
+    [
+    { "hash":"fa278ebfc458360e5aed63d5058cca83c46134f1"
+    , "snaks":
+        { "P143":
+        [
+            { "snaktype":"value"
+            , "property":"P143"
+            , "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
+            , "datavalue":
+            { "value":
+                { "entity-type":"item"
+                , "numeric-id":328
+                , "id":"Q328"
+                }
+            , "type":"wikibase-entityid"
+            }
+            }
+        ]
+        }
+    , "snaks-order":
+        [ "P143"
+        ]
+    }
+    ]
+}
+</pre>
+
+That means claims.references.snaks is this
+<pre>
+        { "P143":
+        [
+            { "snaktype":"value"
+            , "property":"P143"
+            , "hash":"e4f6d9441d0600513c4533c672b5ab472dc73694"
+            , "datavalue":
+            { "value":
+                { "entity-type":"item"
+                , "numeric-id":328
+                , "id":"Q328"
+                }
+            , "type":"wikibase-entityid"
+            }
+            }
+        ]
+        }
+</pre>
+
+Now, going back to "To_scrib_args(Keyval_.Ary(kv))"
+* "kv" represents "P1":[{"property":"P11"}
+* "kv" gets wrapped in Keyval_.Ary b/c SnakDeserialization will deserialize into key/val pairs; '{"P1":[{"property":"P11"}]}' '["P1":[["property":"P11"]]]'
+* "To_scrib_args()"  will put the entire thing as '["1":...]'
 */
\ No newline at end of file
diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor.java
index 36823aada..fedd5a399 100644
--- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor.java
+++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_prop_val_visitor.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2020 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
@@ -116,8 +116,9 @@ public class Wdata_prop_val_visitor implements Wbase_claim_visitor { // THREAD.U
 		Decimal_adp lo = Decimal__parse_or(lo_bry, val);
 		Decimal_adp hi = Decimal__parse_or(hi_bry, val);
 
-		// fmt val
-		if (lo.Eq(hi) && hi.Eq(val))// lo, hi, val are same; print val only;
+		// 2021-02-14|ISSUE#:839|Only print value without ± if lo and hi are null; PAGE:en.w:2019_FIVB_Volleyball_Women%27s_Challenger_Cup#Pool_A;
+		// TOMBSTONE: if (lo.Eq(hi) && hi.Eq(val))
+		if (lo_bry == null && hi_bry == null)
 			bfr.Add(lang.Num_mgr().Format_num_by_decimal(val));			// amount; EX: 1,234
 		else {
 			Wdata_hwtr_msgs msgs = wdata_mgr.Hwtr_mgr().Msgs();
diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java
index 9e4c9ebde..7fd1ef29c 100644
--- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java
+++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2020 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/claims/itms/Wbase_claim_quantity.java b/400_xowa/src/gplx/xowa/xtns/wbases/claims/itms/Wbase_claim_quantity.java
index f30ba8045..3dacc926a 100644
--- a/400_xowa/src/gplx/xowa/xtns/wbases/claims/itms/Wbase_claim_quantity.java
+++ b/400_xowa/src/gplx/xowa/xtns/wbases/claims/itms/Wbase_claim_quantity.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2017 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
@@ -13,58 +13,62 @@ The terms of each license can be found in the source code repository:
 GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
 Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
 */
-package gplx.xowa.xtns.wbases.claims.itms; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.claims.*;
-import gplx.xowa.xtns.wbases.claims.enums.*;
-public class Wbase_claim_quantity extends Wbase_claim_base {
-	public Wbase_claim_quantity(int pid, byte snak_tid, byte[] amount, byte[] unit, byte[] ubound, byte[] lbound) {super(pid, snak_tid);
-		this.amount = amount; this.unit = unit; this.ubound = ubound; this.lbound = lbound;
-	}
-	@Override public byte	Val_tid()	{return Wbase_claim_type_.Tid__quantity;}
-	public byte[]			Amount()	{return amount;} private final    byte[] amount;
-	public byte[]			Ubound()	{return ubound;} private final    byte[] ubound;
-	public byte[]			Lbound()	{return lbound;} private final    byte[] lbound;
-	public byte[]			Unit()		{return unit;} private final    byte[] unit;
-
-	public Decimal_adp Amount_as_num() {
-		if (amount_as_num == null) {
-			amount_as_num = To_decimal_or_null("amount", amount);
-			if (amount_as_num == null) {
-				amount_as_num = Decimal_adp_.Zero;
-				Gfo_usr_dlg_.Instance.Warn_many("", "", "wbase.claim: value is null; name=~{0}", "amount");
-			}
-		}
-		return amount_as_num;
-	}	private Decimal_adp amount_as_num;
-	public Decimal_adp Ubound_as_num() {
-		if (ubound_as_num == null) {
-			ubound_as_num = To_decimal_or_null("upper", ubound);
-			if (ubound_as_num == null) {
-				ubound_as_num = amount_as_num;
-			}
-		}
-		return ubound_as_num;
-	}	private Decimal_adp ubound_as_num;
-	public Decimal_adp Lbound_as_num() {
-		if (lbound_as_num == null) {
-			lbound_as_num = To_decimal_or_null("lower", lbound);
-			if (lbound_as_num == null) {
-				lbound_as_num = amount_as_num;
-			}
-		}
-		return lbound_as_num;
-	}	private Decimal_adp lbound_as_num;
-
-	@Override public void Welcome(Wbase_claim_visitor visitor) {visitor.Visit_quantity(this);}
-	@Override public String toString() {// TEST:
-		return String_.Concat_with_str("|", Wbase_claim_value_type_.Reg.Get_str_or_fail(this.Snak_tid()), Wbase_claim_type_.Reg.Get_str_or_fail(this.Val_tid()), String_.new_u8(amount), String_.new_u8(unit), String_.new_u8(ubound), String_.new_u8(lbound));
-	}
-
-	public static final    byte[] Unit_1 = Bry_.new_a7("1");
-	private static Decimal_adp To_decimal_or_null(String name, byte[] bry) {
-		if (bry == null) return null;
-		int len = bry.length;
-		if (len == 0) return null;
-		if (bry[0] == Byte_ascii.Plus) bry = Bry_.Mid(bry, 1);
-		return Decimal_adp_.parse(String_.new_a7(bry));
-	}
-}
+package gplx.xowa.xtns.wbases.claims.itms;
+
+import gplx.Bry_;
+import gplx.Byte_ascii;
+import gplx.Decimal_adp;
+import gplx.Decimal_adp_;
+import gplx.Gfo_usr_dlg_;
+import gplx.String_;
+import gplx.xowa.xtns.wbases.claims.Wbase_claim_visitor;
+import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_type_;
+import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_;
+
+public class Wbase_claim_quantity extends Wbase_claim_base {
+	public Wbase_claim_quantity(int pid, byte snak_tid, byte[] amount, byte[] unit, byte[] ubound, byte[] lbound) {super(pid, snak_tid);
+		this.amount = amount; this.unit = unit; this.ubound = ubound; this.lbound = lbound;
+	}
+	@Override public byte	Val_tid()	{return Wbase_claim_type_.Tid__quantity;}
+	public byte[]			Amount()	{return amount;} private final    byte[] amount;
+	public byte[]			Ubound()	{return ubound;} private final    byte[] ubound;
+	public byte[]			Lbound()	{return lbound;} private final    byte[] lbound;
+	public byte[]			Unit()		{return unit;} private final    byte[] unit;
+
+	public Decimal_adp Amount_as_num() {
+		if (amount_as_num == null) {
+			amount_as_num = To_decimal_or_null("amount", amount);
+			if (amount_as_num == null) {
+				amount_as_num = Decimal_adp_.Zero;
+				Gfo_usr_dlg_.Instance.Warn_many("", "", "wbase.claim: value is null; name=~{0}", "amount");
+			}
+		}
+		return amount_as_num;
+	}	private Decimal_adp amount_as_num;
+	public Decimal_adp Ubound_as_num() {
+		if (ubound_as_num == null) {
+			ubound_as_num = To_decimal_or_null("upper", ubound);
+		}
+		return ubound_as_num;
+	}	private Decimal_adp ubound_as_num;
+	public Decimal_adp Lbound_as_num() {
+		if (lbound_as_num == null) {
+			lbound_as_num = To_decimal_or_null("lower", lbound);
+		}
+		return lbound_as_num;
+	}	private Decimal_adp lbound_as_num;
+
+	@Override public void Welcome(Wbase_claim_visitor visitor) {visitor.Visit_quantity(this);}
+	@Override public String toString() {// TEST:
+		return String_.Concat_with_str("|", Wbase_claim_value_type_.Reg.Get_str_or_fail(this.Snak_tid()), Wbase_claim_type_.Reg.Get_str_or_fail(this.Val_tid()), String_.new_u8(amount), String_.new_u8(unit), String_.new_u8(ubound), String_.new_u8(lbound));
+	}
+
+	public static final    byte[] Unit_1 = Bry_.new_a7("1");
+	private static Decimal_adp To_decimal_or_null(String name, byte[] bry) {
+		if (bry == null) return null;
+		int len = bry.length;
+		if (len == 0) return null;
+		if (bry[0] == Byte_ascii.Plus) bry = Bry_.Mid(bry, 1);
+		return Decimal_adp_.parse(String_.new_a7(bry));
+	}
+}
diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_pf_property__basic__tst.java b/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_pf_property__basic__tst.java
index 600dc8910..6f8cc9df6 100644
--- a/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_pf_property__basic__tst.java
+++ b/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_pf_property__basic__tst.java
@@ -1,6 +1,6 @@
 /*
 XOWA: the XOWA Offline Wiki Application
-Copyright (C) 2012-2020 gnosygnu@gmail.com
+Copyright (C) 2012-2021 gnosygnu@gmail.com
 
 XOWA is licensed under the terms of the General Public License (GPL) Version 3,
 or alternatively under the terms of the Apache License Version 2.0.
@@ -89,9 +89,11 @@ public class Wdata_pf_property__basic__tst {
 
 		fxt.Test_parse("{{#property:p1}}", "1,234±2");
 	}
-	@Test public void Quantity__plus_minus__n() {	// PURPOSE:do not output ± if lbound == val == ubound; PAGE:en.w:Tintinan DATE:2015-08-02
+	// 2021-02-14|ISSUE#:839|Only print value without ± if lo and hi are null; PAGE:en.w:2019_FIVB_Volleyball_Women%27s_Challenger_Cup#Pool_A
+	// TOMBSTONE:2015-08-02|do not output ± if lbound == val == ubound; PAGE:en.w:Tintinan
+	@Test public void Quantity__plus_minus__n() {
 		fxt.Init__docs__add(fxt.Wdoc("Q1")				
-			.Add_claims(fxt.Make_claim_quantity(1, "+1234", "1", "+1234", "+1234"))
+			.Add_claims(fxt.Make_claim_quantity(1, "+1234", "1", null, null))
 			.Add_sitelink("enwiki", "Test_page")
 			);
 
@@ -107,7 +109,7 @@ public class Wdata_pf_property__basic__tst {
 	}
 	@Test public void Quantity__long() {	// PURPOSE: must cast to long for large numbers; EX:{{#property:P1082}} PAGE:en.w:Earth; DATE:2015-08-02
 		fxt.Init__docs__add(fxt.Wdoc("Q1")				
-			.Add_claims(fxt.Make_claim_quantity(1, "+4321000000", "1", "4321000000", "4321000000"))
+			.Add_claims(fxt.Make_claim_quantity(1, "+4321000000", "1", null, null))
 			.Add_sitelink("enwiki", "Test_page")
 			);