diff --git a/base/web/matrix.go b/base/web/matrix.go
index b2579daa..b0c0b470 100644
--- a/base/web/matrix.go
+++ b/base/web/matrix.go
@@ -102,10 +102,12 @@ func init() {
 				if u := kit.ParseURL(m.Option(ORIGIN)); m.Warn(u.Query().Get(TOKEN) == "", ice.ErrNotValid, TOKEN) {
 					return
 				} else {
-					m.OptionDefault(mdb.NAME, kit.Split(u.Hostname(),".")[0])
+					m.Option(TOKEN, u.Query().Get(TOKEN))
+					m.Option(ORIGIN, kit.Format("%s://%s", u.Scheme, u.Host))
+					m.OptionDefault(mdb.NAME, kit.Split(u.Hostname(), ".")[0])
+					m.Cmd(SPIDE, mdb.CREATE, m.OptionSimple("name,origin,icons,token"), mdb.TYPE, nfs.REPOS)
+					m.Cmd(SPIDE, DEV_CREATE_TOKEN, ice.Maps{CLIENT_NAME: m.Option(mdb.NAME)})
 				}
-				m.Cmd(SPIDE, mdb.CREATE, mdb.NAME, "", arg, mdb.TYPE, nfs.REPOS)
-				m.Cmd(SPIDE, DEV_CREATE_TOKEN, ice.Maps{CLIENT_NAME: m.Option(mdb.NAME)})
 			}},
 			mdb.REMOVE: {Hand: func(m *ice.Message, arg ...string) { _matrix_dream(m, nfs.TRASH); _matrix_dream(m, "") }},
 			cli.START:  {Hand: func(m *ice.Message, arg ...string) { _matrix_dream(m, "") }},
diff --git a/base/web/spide.go b/base/web/spide.go
index 060e7ffa..69012f32 100644
--- a/base/web/spide.go
+++ b/base/web/spide.go
@@ -29,7 +29,7 @@ func _spide_create(m *ice.Message, name, link, types, icons, token string) {
 		dir, file := path.Split(u.EscapedPath())
 		m.Logs(mdb.INSERT, SPIDE, name, LINK, link)
 		mdb.HashSelectUpdate(m, mdb.HashCreate(m, CLIENT_NAME, name), func(value ice.Map) {
-			value[mdb.ICONS], value[TOKEN] = icons, token
+			value[mdb.ICONS], value[TOKEN] = icons, kit.Select(kit.Format(value[TOKEN]), token)
 			value[SPIDE_CLIENT] = kit.Dict(mdb.NAME, name, mdb.TYPE, types,
 				SPIDE_METHOD, http.MethodGet, URL, link, ORIGIN, u.Scheme+"://"+u.Host,
 				tcp.PROTOCOL, u.Scheme, tcp.HOSTNAME, u.Hostname(), tcp.HOST, u.Host, nfs.PATH, dir, nfs.FILE, file, cli.TIMEOUT, "300s",