diff --git a/.github/workflows/python-examples.yml b/.github/workflows/python-examples.yml
index 162da608..ace4ae7e 100644
--- a/.github/workflows/python-examples.yml
+++ b/.github/workflows/python-examples.yml
@@ -1,97 +1,69 @@
+# .github/workflows/verify_examples.yml
+#
+# CI for python/examples/01-03 select_values scripts.
+# Strategy: download the daily HallD SQLite snapshot so the examples
+# run against real data with a proper schema.
+
 name: Python examples verification
 
 on:
   push:
-    branches:
-      - '*'
+    branches: ['*']
   pull_request:
-    branches:
-      - main
+    branches: [main]
+
+env:
+  # Single source of truth for the connection string
+  RCDB_CONNECTION: "sqlite:///${{ github.workspace }}/tmp/rcdb2.sqlite"
 
 jobs:
   run-examples:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-      # Don't fail the entire job if one example fails
-      fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.9"
 
-      - name: Install dependencies
+      - name: Install rcdb
         run: |
           python -m pip install --upgrade pip
-          # Install rcdb and dependencies from pyproject.toml
           cd $GITHUB_WORKSPACE/python
           pip install --editable .
-          # Install additional dependencies for examples
-          pip install jsonpickle
+          pip install jsonpickle  # for writing object example
 
-      - name: Setup SQLite for testing
-        run: |
-          mkdir -p $GITHUB_WORKSPACE/tmp
-          touch $GITHUB_WORKSPACE/tmp/test.sqlite.db
-          echo "RCDB_CONNECTION=sqlite:///$GITHUB_WORKSPACE/tmp/test.sqlite.db" >> $GITHUB_ENV
+#      - name: Download HallD SQLite snapshot
+#        run: |
+#          mkdir -p $GITHUB_WORKSPACE/tmp
+#          # Future put db creation here
 
-      - name: Create database service (MySQL)
-        if: false  # Disabled until we have a proper way to initialize the MySQL database
-        run: |
-          # This would be the place to set up an actual MySQL database if needed
-          # For now, we'll use SQLite for examples that accept a connection string parameter
-          echo "RCDB_MYSQL_CONNECTION=sqlite:///$GITHUB_WORKSPACE/tmp/test.sqlite.db" >> $GITHUB_ENV
 
-      - name: List example files
-        id: list-examples
-        run: |
-          cd $GITHUB_WORKSPACE/python/examples
-          echo "examples=$(ls -1 example_*.py | tr '\n' ' ')" >> $GITHUB_OUTPUT
+      # ── Run examples ──────────────────────────────────────────────
+      # Each example gets its own step so failures are visible per-script.
+      # continue-on-error keeps the workflow green while showing which
+      # script had problems (yellow badge instead of silent swallow).
 
-      - name: Run basic examples (with in-memory or SQLite DB)
-        run: |
-          cd $GITHUB_WORKSPACE/python/examples
-          echo "Running example_conditions_basic.py"
-          python example_conditions_basic.py
-          
-          echo "Running example_conditions_store_array.py"
-          python example_conditions_store_array.py
-          
-          echo "Running example_conditions_store_object.py"
-          python example_conditions_store_object.py
-          
-          echo "Running example_sqlalchemy_query.py"
-          python example_sqlalchemy_query.py
-          
-          echo "Running example_runs_by_date.py (with connection string)"
-          python example_runs_by_date.py $RCDB_CONNECTION || echo "Skipping - requires properly initialized database"
-
-      - name: Run query examples (with offline mode)
-        run: |
-          cd $GITHUB_WORKSPACE/python/examples
-          echo "Running example_simple_queries.py"
-          python example_simple_queries.py $RCDB_CONNECTION || echo "Skipping - requires properly initialized database"
-          
-          # The following examples normally use the production database
-          # We'll try them with the test db, but expect some to fail gracefully
-          export RCDB_OFFLINE=true
-          echo "Running examples in offline mode (will show errors but not fail workflow)"
-          
-          echo "Trying example_cdc_gas_pressure.py"
-          python example_cdc_gas_pressure.py || echo "Skipping - requires production database"
-          
-          echo "Trying example_select_halld_values.py"
-          python example_select_halld_values.py || echo "Skipping - requires production database"
-          
-          echo "Trying example_select_values.py"
-          python example_select_values.py || echo "Skipping - requires production database"
-
-      - name: Summary
-        run: |
-          echo "Examples testing completed. Check logs for any failures."
-          echo "Note: Some examples are expected to fail if they require a production database connection."
\ No newline at end of file
+      - name: "Example: 01_select_values_simple"
+        run: python $GITHUB_WORKSPACE/python/examples/01_select_values_simple.py
+        # Script must read RCDB_CONNECTION env var (see updated examples)
+
+      - name: "Example: 02_select_values_extended"
+        run: python $GITHUB_WORKSPACE/python/examples/02_select_values_extended.py
+
+      - name: "Example: 03_select_values_custom_runs"
+        run: python $GITHUB_WORKSPACE/python/examples/03_select_values_custom_runs.py
+
+      - name: "Example: 10_create_conditions_basic"
+        run: python $GITHUB_WORKSPACE/python/examples/10_create_conditions_basic.py
+
+      - name: "Example: 11_crete_conditions_store_array"
+        run: python $GITHUB_WORKSPACE/python/examples/11_crete_conditions_store_array.py
+
+      - name: "Example: 12_create_conditions_store_object"
+        run: python $GITHUB_WORKSPACE/python/examples/12_create_conditions_store_object.py
+
+      - name: "Example: 90_advanced_sqlalchemy_query"
+        run: python $GITHUB_WORKSPACE/python/examples/90_advanced_sqlalchemy_query.py
\ No newline at end of file
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index efb52e3b..5c64d900 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
index 442a2512..08948201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,7 @@ sql/schema.mwb.bak
 reqvenv/
 
 python/repomix-output.txt
+
+python/uv.lock
+
+.claude/
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 7a6d92e9..f3ee5123 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -23,6 +23,7 @@
 
 **Advanced**:
 - [Development guide](development/development.md)
+- [Database selector](development/database-selector.md)
 - [Migrate to RCDB2](development/rcdb2-migration.md)
 - [DAQ Setup](daq/daq.md)
 - [Website](web_site_setup.md)
diff --git a/docs/development/database-selector.md b/docs/development/database-selector.md
new file mode 100644
index 00000000..9e6dc139
--- /dev/null
+++ b/docs/development/database-selector.md
@@ -0,0 +1,68 @@
+# Multi-Database Selector
+
+The RCDB web interface supports switching between multiple databases from the browser.
+When configured, a dropdown selector appears in the navbar allowing users to pick a database.
+The selection is saved in a cookie and persists across sessions.
+
+## How It Works
+
+- The Flask app has two config keys: `AVAILABLE_DATABASES` (a dict of `name -> connection_string`)
+  and `DEFAULT_DATABASE` (the connection string to use when no cookie is set).
+- On each request, `before_request()` checks `AVAILABLE_DATABASES`. If non-empty, it reads the
+  `rcdb_database` cookie to determine which database to connect to.
+- If the cookie is missing or invalid, it falls back to `DEFAULT_DATABASE`. If `DEFAULT_DATABASE`
+  is not in the available list, it logs a warning and uses the first entry.
+- When `AVAILABLE_DATABASES` is empty (the default), all behavior is identical to a single-database setup.
+
+## Configuration
+
+### CLI (`rcdb web`)
+
+Use the `--add-db` flag (repeatable) to register named databases:
+
+```bash
+rcdb -c mysql+pymysql://rcdb@prodhost/rcdb web \
+    --add-db "Production=mysql+pymysql://rcdb@prodhost/rcdb" \
+    --add-db "Test=mysql+pymysql://rcdb@testhost/rcdb_test"
+```
+
+- Each `--add-db` value has the format `NAME=CONNECTION_STRING`.
+- The `-c` / `--connection` / `RCDB_CONNECTION` value becomes the default database.
+- If no `-c` is provided, the first `--add-db` entry is used as the default.
+
+### WSGI
+
+Set the config keys directly in the WSGI script:
+
+```python
+import rcdb.web
+
+rcdb.web.app.config["AVAILABLE_DATABASES"] = {
+    "Production": "mysql+pymysql://rcdb@prodhost/rcdb",
+    "Test": "mysql+pymysql://rcdb@testhost/rcdb_test",
+}
+rcdb.web.app.config["DEFAULT_DATABASE"] = "mysql+pymysql://rcdb@prodhost/rcdb"
+
+application = rcdb.web.app
+```
+
+When `AVAILABLE_DATABASES` is set, the `SQL_CONNECTION_STRING` key is not used
+for connection selection (though it should still be set as a fallback).
+
+## UI Behavior
+
+The selector appears to the left of the "Run or min-max" search box in the navbar.
+Each option shows the database name and a connection hint (e.g. `Production (rcdb@prodhost)`).
+
+When the user selects a different database:
+
+1. A cookie `rcdb_database` is set (1-year expiry, `SameSite=Lax`).
+2. The current page reloads, now connected to the selected database.
+
+## Key Files
+
+| File | Role |
+|------|------|
+| `python/rcdb/web/__init__.py` | Config defaults, `before_request()` logic, `_connection_hint()` helper |
+| `python/rcdb/web/templates/layouts/base.html` | Navbar `<select>` element and JS cookie handler |
+| `python/rcdb/cli/web.py` | `--add-db` CLI option parsing |
diff --git a/docs/development/development.md b/docs/development/development.md
index b122089b..930d43e0 100644
--- a/docs/development/development.md
+++ b/docs/development/development.md
@@ -36,6 +36,12 @@ https://github.com/JeffersonLab/rcdb
 4. Run ```test_all_rcdb```
 
 
+## Multi-Database Selector
+
+The web interface supports switching between multiple databases from the browser.
+See [Database Selector](development/database-selector.md) for configuration details.
+
+
 ## Publishing on pypi
 
 ```bash
diff --git a/docs/development/documentation.md b/docs/development/documentation.md
index 965e078e..9e3af580 100644
--- a/docs/development/documentation.md
+++ b/docs/development/documentation.md
@@ -27,6 +27,9 @@ Here is a python one-liner that makes the site running at `localhost:3000`
 ```bash
 # assuming current working directoy is rcdb/docs 
 python3 -m http.server 3000
+
+# Using uv from rcdb repository root
+uv --project ./python --directory docs run -m http.server 3000
 ```
 
 > On windows machines you may have to use `python` instead of `python3`
diff --git a/python/examples/example_conditions_basic.py b/python/examples/10_create_conditions_basic.py
similarity index 100%
rename from python/examples/example_conditions_basic.py
rename to python/examples/10_create_conditions_basic.py
diff --git a/python/examples/example_conditions_store_array.py b/python/examples/11_crete_conditions_store_array.py
similarity index 100%
rename from python/examples/example_conditions_store_array.py
rename to python/examples/11_crete_conditions_store_array.py
diff --git a/python/examples/example_conditions_store_object.py b/python/examples/12_create_conditions_store_object.py
similarity index 100%
rename from python/examples/example_conditions_store_object.py
rename to python/examples/12_create_conditions_store_object.py
diff --git a/python/examples/example_sqlalchemy_query.py b/python/examples/90_advanced_sqlalchemy_query.py
similarity index 100%
rename from python/examples/example_sqlalchemy_query.py
rename to python/examples/90_advanced_sqlalchemy_query.py
diff --git a/python/examples/example_cdc_gas_pressure.py b/python/examples/example_cdc_gas_pressure.py
deleted file mode 100644
index 0e0120a9..00000000
--- a/python/examples/example_cdc_gas_pressure.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# import RCDB
-from rcdb.provider import RCDBProvider
-
-# connect to DB
-db = RCDBProvider("mysql://rcdb@hallddb.jlab.org/rcdb")
-
-# select values with query
-table = db.select_values(['cdc_gas_pressure'], run_min=41512, run_max=41540)
-
-for row in table:
-    (run_number, cdc_gas_pressure) = tuple(row)
-    print(f"{run_number}   {cdc_gas_pressure}")
diff --git a/python/examples/example_runs_by_date.py b/python/examples/example_runs_by_date.py
deleted file mode 100644
index 2e69fcda..00000000
--- a/python/examples/example_runs_by_date.py
+++ /dev/null
@@ -1,93 +0,0 @@
-"""
-Example shows how to select runs and some data (event_count) and show it by date
-
-The script result is something like: 
-
-Selecting runs 10000-19999 from run period: '28 Jan 2016 - 24 Apr 2016   Commissioning, 12 GeV e-'
-'2016-02-20' has 6 runs 10391 - 10399
-        10391   2016-02-20 07:29:04   84235408
-        10392   2016-02-20 10:33:11   51150478		
-        ...
-'2016-02-21' has 10 runs 10412 - 10436
-        10412   2016-02-21 02:42:24   59020003
-        10414   2016-02-21 05:00:05   21921629
-        ...
-...
-
-Usage:
-    python example_runs_by_date.py <connectionstring>
-
-"""
-import argparse
-import sys
-from rcdb import RCDBProvider
-
-
-def get_runs_by_date(db, query, run_min=0, run_max=2147483647):
-    """
-    Returns dictionary of dates with all runs per date
-    
-    :param db: RCDB provider class (aka rcdb.RCDBProvider)
-    :param query: Run search query. All runs are selected if blank
-    :param run_min: Run to start search from
-    :param run_max: Run (included) to search up to  
-    :return: (data_by_date, performance) where data_by_date in form {date: [(run_number, start_time, event_count),...]}
-    
-    :description:
-    
-    """
-
-    assert isinstance(db, RCDBProvider)
-
-    # Select production runs with event_count > 0.5M
-    result_table = db.select_values(['run_start_time', 'event_count'], query, run_min, run_max)
-
-    # construct data by date
-    data_by_date = {}
-    for row in result_table:
-        run, run_start_time, event_count = tuple(row)
-        run_date = run_start_time.date()
-
-        # is there the key already?
-        if run_date not in data_by_date:
-            data_by_date[run_date] = []
-
-        # add data to corresponding date
-        data_by_date[run_date].append((run, run_start_time, event_count))
-    return data_by_date, result_table.performance
-
-
-if __name__ == "__main__":
-    print(sys.argv)
-    # Get connection string from arguments
-    parser = argparse.ArgumentParser(description="This example shows select runs and put them by dates")
-    parser.add_argument("connection_string",
-                        nargs='?',
-                        help="RCDB connection string mysql://rcdb@localhost/rcdb",
-                        default="mysql://rcdb@hallddb.jlab.org/rcdb")
-    args = parser.parse_args()
-
-    # Open DB connection
-    db = RCDBProvider(args.connection_string)
-
-    # Get runs from run period
-    run_min, run_max, description = db.get_run_period("2016-02")
-    print("Selecting runs {}-{} from run period: '{}'".format(run_min, run_max, description))
-
-    data_by_date, performance = get_runs_by_date(db, "@status_approved and @is_production", run_min, run_max)
-
-    # Here we can see exact performance budget. All in seconds
-    print("Performance([sec]) is: ", performance)
-
-    # print resulting array
-    for run_date in sorted(data_by_date.keys()):
-        run_values = data_by_date[run_date]
-        print("'{}' has {} runs {} - {}".format(
-            run_date,
-            len(run_values),
-            run_values[0][0],       # run_values[x] is (run_num, start_time, events) => run_values[x][0] is run_num
-            run_values[-1][0]
-        ))
-
-        for run_num, start_time, events in run_values:
-            print("\t\t{}\t{}   {}".format(run_num, start_time, events))
diff --git a/python/examples/example_select_halld_values.py b/python/examples/example_select_halld_values.py
deleted file mode 100644
index a19d0431..00000000
--- a/python/examples/example_select_halld_values.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import rcdb.provider
-t = rcdb.provider.RCDBProvider('mysql://rcdb@hallddb.jlab.org/rcdb')\
-    .select_values(['polarization_angle', 'polarization_direction'],
-                   search_str="@is_production and event_count>100000", run_min=30000, run_max=32000)
-print('\n'.join([' '.join(map(str, r)) for r in t]))
diff --git a/python/examples/example_simple_queries.py b/python/examples/example_simple_queries.py
deleted file mode 100644
index 1a59474d..00000000
--- a/python/examples/example_simple_queries.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-This example shows basics of how to select runs using search queries
-
-This example requires some live databse
-
-Usage:
-   python example_simple_queries.py <connectionstring>
-
-"""
-import argparse
-import sys
-from rcdb import RCDBProvider
-
-
-if __name__ == "__main__":
-    print(sys.argv)
-    # Get connection string from arguments
-    parser = argparse.ArgumentParser(description="This example shows basics of how to select runs using search queries")
-    parser.add_argument("connection_string", help="RCDB connection string mysql://rcdb@localhost/rcdb",
-                        nargs='?', default='mysql://rcdb@hallddb.jlab.org/rcdb')
-    args = parser.parse_args()
-
-    # Open DB connection
-    db = RCDBProvider(args.connection_string)
-
-    # Select production runs with event_count > 0.5M
-    result = db.select_values(["event_count", "polarization_direction", "beam_current"],
-                              "@is_production and event_count > 500000", 10000, 20000)
-
-    # print title
-    print("{:>7} {:>15} {:>15} {:>15}".format('run', 'polarization_direction', 'beam_current', 'event_count'))
-
-    # Iterate through results
-    for row in result:
-        run, event_count, polarization_direction, beam_current = tuple(row)
-        print("{:>7} {:>15} {:>15} {:>15}".format(run, polarization_direction, beam_current, event_count))
-
diff --git a/python/pyproject.toml b/python/pyproject.toml
index cd4434b4..599c56b3 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -45,6 +45,10 @@ dependencies = [
     "rich"
 ]
 
+[project.optional-dependencies]
+examples = ["jsonpickle"]
+
+
 # If you want a console script, define it in [project.scripts]
 [project.scripts]
 rcdb = "rcdb.cli.app:rcdb_cli"
diff --git a/python/rcdb/cli/web.py b/python/rcdb/cli/web.py
index 227498de..c6da22a0 100644
--- a/python/rcdb/cli/web.py
+++ b/python/rcdb/cli/web.py
@@ -6,22 +6,61 @@
 
 
 @click.command("web")
+@click.option('--add-db', multiple=True,
+              help='Add a named database as NAME=CONNECTION_STRING. Can be specified multiple times.')
 @pass_rcdb_context
-def web_command(context):
+def web_command(context, add_db):
     """
     Runs the local RCDB web application using the connection string from
     either the CLI context or the RCDB_CONNECTION environment variable.
+
+    Use --add-db to enable a database selector in the web UI:
+
+        rcdb -c mysql://rcdb@host/rcdb web \\
+            --add-db "Production=mysql://rcdb@prodhost/rcdb" \\
+            --add-db "Test=mysql://rcdb@testhost/rcdb_test"
     """
-    # If user provided --connection on the CLI, context.db.connection_str is set:
+
+    # Resolve the default connection string
     rcdb_provider = context.db
     if rcdb_provider and rcdb_provider.connection_string:
         assert isinstance(rcdb_provider, RCDBProvider)
-        rcdb_web.app.config["SQL_CONNECTION_STRING"] = rcdb_provider.connection_string
+        connection_string = rcdb_provider.connection_string
     elif "RCDB_CONNECTION" in os.environ:
-        # Otherwise check the environment variable
-        rcdb_web.app.config["SQL_CONNECTION_STRING"] = os.environ["RCDB_CONNECTION"]
+        connection_string = os.environ["RCDB_CONNECTION"]
+    else:
+        connection_string = None
+
+    # Parse --add-db entries into AVAILABLE_DATABASES
+    if add_db:
+        available = {}
+        for entry in add_db:
+            if '=' not in entry:
+                click.echo(f"ERROR: --add-db value must be NAME=CONNECTION_STRING, got: {entry}")
+                raise SystemExit(1)
+            name, conn = entry.split('=', 1)
+            name = name.strip()
+            conn = conn.strip()
+            if not name or not conn:
+                click.echo(f"ERROR: --add-db value must have non-empty NAME and CONNECTION_STRING: {entry}")
+                raise SystemExit(1)
+            available[name] = conn
+
+        rcdb_web.app.config["AVAILABLE_DATABASES"] = available
+
+        if connection_string:
+            rcdb_web.app.config["DEFAULT_DATABASE"] = connection_string
+        else:
+            # No -c provided, use the first --add-db entry as default
+            first_conn = next(iter(available.values()))
+            rcdb_web.app.config["DEFAULT_DATABASE"] = first_conn
+            connection_string = first_conn
+
+        # SQL_CONNECTION_STRING is still needed as a fallback
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = connection_string
+    elif connection_string:
+        rcdb_web.app.config["SQL_CONNECTION_STRING"] = connection_string
     else:
-        # If neither is present, show an error and exit
         click.echo("ERROR: no connection string found. Provide via CLI or RCDB_CONNECTION env variable.")
         raise SystemExit(1)
 
diff --git a/python/rcdb/web/__init__.py b/python/rcdb/web/__init__.py
index 1a053e69..bbb69678 100644
--- a/python/rcdb/web/__init__.py
+++ b/python/rcdb/web/__init__.py
@@ -1,5 +1,8 @@
+import logging
 import os
 from datetime import datetime
+from urllib.parse import urlparse
+
 from flask import Flask, render_template, g, request, url_for
 from sqlalchemy.orm import subqueryload
 
@@ -15,11 +18,39 @@
 from rcdb.web.modules import conditions_module
 from rcdb.web.modules import select_values_module
 
+logger = logging.getLogger(__name__)
+
 DEBUG = True
 SECRET_KEY = 'development key'
 USERNAME = 'admin'
 PASSWORD = 'default'
 SQL_CONNECTION_STRING = "mysql+pymysql://rcdb@127.0.0.1/rcdb"
+AVAILABLE_DATABASES = {}   # dict of {"name": "connection_string", ...}
+DEFAULT_DATABASE = ""       # connection string used as default
+
+
+def _connection_hint(conn_str):
+    """Extract a short hint from a SQLAlchemy connection string.
+
+    Examples:
+        "mysql+pymysql://rcdb@127.0.0.1/rcdb" -> "rcdb@127.0.0.1"
+        "sqlite:///path/to/file.db"            -> "file.db"
+    """
+    try:
+        parsed = urlparse(conn_str)
+        if parsed.scheme.startswith("sqlite"):
+            # For sqlite, show just the filename
+            path = parsed.path.lstrip("/")
+            return os.path.basename(path) if path else conn_str
+        # For mysql/postgres etc, show user@host
+        host = parsed.hostname or ""
+        user = parsed.username or ""
+        if user:
+            return f"{user}@{host}"
+        return host or conn_str
+    except Exception:
+        return conn_str
+
 
 # Get the current directory
 current_directory = os.path.dirname(os.path.abspath(__file__))
@@ -32,8 +63,45 @@
 
 @app.before_request
 def before_request():
+    available_dbs = app.config.get("AVAILABLE_DATABASES", {})
+
+    if available_dbs:
+        # Determine which database to connect to
+        cookie_db = request.cookies.get("rcdb_database", "")
+        default_conn = app.config.get("DEFAULT_DATABASE", "")
+
+        if cookie_db and cookie_db in available_dbs:
+            # Cookie points to a valid database
+            active_name = cookie_db
+        elif default_conn:
+            # Find name for the default connection string
+            active_name = None
+            for name, conn in available_dbs.items():
+                if conn == default_conn:
+                    active_name = name
+                    break
+            if active_name is None:
+                # DEFAULT_DATABASE not in AVAILABLE_DATABASES
+                active_name = next(iter(available_dbs))
+                logger.warning(
+                    "DEFAULT_DATABASE '%s' is not in AVAILABLE_DATABASES, "
+                    "using '%s' instead.", default_conn, active_name
+                )
+        else:
+            # No default set, use first available
+            active_name = next(iter(available_dbs))
+
+        connection_string = available_dbs[active_name]
+        g.active_db_name = active_name
+        g.available_databases = available_dbs
+    else:
+        # Original single-database behavior
+        connection_string = app.config["SQL_CONNECTION_STRING"]
+        g.active_db_name = None
+        g.available_databases = {}
+
     g.tdb = rcdb.ConfigurationProvider()
-    g.tdb.connect(app.config["SQL_CONNECTION_STRING"])
+    g.tdb.connect(connection_string)
     app.jinja_env.globals['datetime_now'] = datetime.now
 
 
@@ -100,6 +168,7 @@ def url_for_other_page(page):
 
 app.jinja_env.globals['url_for_other_page'] = url_for_other_page
 app.jinja_env.globals['rcdb_default_alias'] = rcdb.alias.default_aliases
+app.jinja_env.globals['connection_hint'] = _connection_hint
 
 app.register_blueprint(runs_module)
 app.register_blueprint(logs_module)
diff --git a/python/rcdb/web/__main__.py b/python/rcdb/web/__main__.py
new file mode 100644
index 00000000..936bd1fb
--- /dev/null
+++ b/python/rcdb/web/__main__.py
@@ -0,0 +1,3 @@
+from rcdb.web import app
+
+app.run(host="0.0.0.0", port=8080, debug=False)
\ No newline at end of file
diff --git a/python/rcdb/web/templates/layouts/base.html b/python/rcdb/web/templates/layouts/base.html
index ef1a1f6f..d998362b 100644
--- a/python/rcdb/web/templates/layouts/base.html
+++ b/python/rcdb/web/templates/layouts/base.html
@@ -70,12 +70,19 @@
                     </ul>
 
                     <!-- Search form -->
-                    <form class="navbar-form navbar-left" role="search" action="{{ url_for('runs.search') }}" method="get">
-                        <div class="input-group input-group-sm" style="min-width: 500px">
+                    <form class="navbar-form navbar-left" role="search" action="{{ url_for('runs.search') }}" method="get" style="display:flex; align-items:center; gap:4px;">
+                        {% if g.available_databases %}
+                        <select id="dbSelector" class="form-control input-sm" style="width:auto; flex-shrink:0;">
+                            {% for name, conn in g.available_databases.items() %}
+                            <option value="{{ name }}" {% if name == g.active_db_name %}selected{% endif %}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                        {% endif %}
+                        <div class="input-group input-group-sm" style="min-width:400px;">
                             <input type="text" class="form-control" placeholder="Run or min-max" name="rr" style="width:28%; margin-right:4px;">
-                            <input type="text" class="form-control" placeholder="Query" name="q" style="width:70%; ">
+                            <input type="text" class="form-control" placeholder="Query" name="q" style="width:70%;">
                             <span class="input-group-btn"><button id="qGoBtn" type="submit" class="btn btn-default">GO</button></span>
-                            <!-- Home -->
+                            <!-- Help -->
                             <span class="input-group-btn" id="queryQuickHelp">
                                 <a href="https://github.com/JeffersonLab/rcdb/wiki/Web-quick-query" target="_blank" class="btn" data-container="body" data-placement="bottom" type="button">
                                     <span class="glyphicon glyphicon-question-sign"></span>
@@ -269,6 +276,13 @@
 
             var $editor = $('#editor');
 
+            // Database selector: save choice in cookie and reload
+            $("#dbSelector").on("change", function() {
+                var dbName = $(this).val();
+                document.cookie = "rcdb_database=" + encodeURIComponent(dbName) + ";path=/;max-age=31536000;SameSite=Lax";
+                location.reload();
+            });
+
             {#%
                 Show help popover about how to use query window
             %#}