diff --git a/demo/url-search-params.ysh b/demo/url-search-params.ysh
index 91c14bac45..1de91e0201 100755
--- a/demo/url-search-params.ysh
+++ b/demo/url-search-params.ysh
@@ -141,11 +141,11 @@ proc test-part() {
   for s in (PART_CASES) {
     js-decode-part $s | json read (&js)
     echo 'JS'
-    pp line (js)
+    pp test_ (js)
 
     echo 'YSH'
     var y = unquote(s)
-    pp line (y)
+    pp test_ (y)
 
     assert [y === js]
 
diff --git a/soil/common.sh b/soil/common.sh
index 1752723a0b..48161f700b 100644
--- a/soil/common.sh
+++ b/soil/common.sh
@@ -20,23 +20,34 @@ dump-env() {
   env | grep -v '^encrypted_' | sort
 }
 
-if true; then
-  readonly SOIL_USER='travis_admin'
-  readonly SOIL_HOST='ci.oilshell.org'
-  readonly SOIL_HOST_DIR=~/ci.oilshell.org  # used on server
-  readonly SOIL_REMOTE_DIR=ci.oilshell.org  # used on client
-elif false; then
-  readonly SOIL_USER='oils'
-  readonly SOIL_HOST='mb.oils.pub'
-  # Extra level
-  readonly SOIL_HOST_DIR=~/www/mb.oils.pub  # used on server
-  readonly SOIL_REMOTE_DIR=www/mb.oils.pub  # used on client
-else
-  readonly SOIL_USER='oils'
-  readonly SOIL_HOST='op.oils.pub'
-  readonly SOIL_HOST_DIR=~/op.oils.pub  # used on server
-  readonly SOIL_REMOTE_DIR=op.oils.pub  # used on client
-fi
+# dh, mb, op
+_soil_service=mb
+
+case $_soil_service in
+  dh)
+    readonly SOIL_USER='travis_admin'
+    readonly SOIL_HOST='ci.oilshell.org'
+    readonly SOIL_HOST_DIR=~/ci.oilshell.org  # used on server
+    readonly SOIL_REMOTE_DIR=ci.oilshell.org  # used on client
+    ;;
+  mb)
+    readonly SOIL_USER='oils'
+    readonly SOIL_HOST='mb.oils.pub'
+    # Extra level
+    readonly SOIL_HOST_DIR=~/www/mb.oils.pub  # used on server
+    readonly SOIL_REMOTE_DIR=www/mb.oils.pub  # used on client
+    ;;
+  op)
+    readonly SOIL_USER='oils'
+    readonly SOIL_HOST='op.oils.pub'
+    readonly SOIL_HOST_DIR=~/op.oils.pub  # used on server
+    readonly SOIL_REMOTE_DIR=op.oils.pub  # used on client
+    ;;
+  *)
+    echo "Invalid Soil service $_soil_service" >& 2
+    exit 1
+    ;;
+esac
 
 readonly SOIL_USER_HOST="$SOIL_USER@$SOIL_HOST"
 
diff --git a/soil/web-init.sh b/soil/web-init.sh
index 15e355c158..8e98a597a9 100755
--- a/soil/web-init.sh
+++ b/soil/web-init.sh
@@ -53,27 +53,28 @@ home-page() {
 
       <tr>
         <td>
-          <a href="uuu/sourcehut-jobs/">sr.ht</a> 
+          <a href="uuu/github-jobs/">Github Actions</a> 
         </td>
         <td>
-          <a href="https://builds.sr.ht/~andyc">builds.sr.ht</a>
+          <a href="https://github.com/oilshell/oil/actions/workflows/all-builds.yml">github.com</a>
         </td>
         <td>
-          <a href="https://github.com/oils-for-unix/oils/tree/master/.builds">.builds</a>
+          <a href="https://github.com/oils-for-unix/oils/tree/master/.github/workflows">.github/workflows</a>
         </td>
       </tr>
 
       <tr>
         <td>
-          <a href="uuu/github-jobs/">Github Actions</a> 
+          <a href="uuu/sourcehut-jobs/">sr.ht</a> 
         </td>
         <td>
-          <a href="https://github.com/oilshell/oil/actions/workflows/all-builds.yml">github.com</a>
+          <a href="https://builds.sr.ht/~andyc">builds.sr.ht</a>
         </td>
         <td>
-          <a href="https://github.com/oils-for-unix/oils/tree/master/.github/workflows">.github/workflows</a>
+          <a href="https://github.com/oils-for-unix/oils/tree/master/.builds">.builds</a>
         </td>
       </tr>
+
 EOF
 
   if false; then