diff --git a/package-lock.json b/package-lock.json
index fe7ac551620..820179a2288 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47387,6 +47387,7 @@
         "mongodb": "^6.8.0",
         "mongodb-connection-string-url": "^3.0.1",
         "mongodb-data-service": "^22.23.1",
+        "mongodb-ns": "^2.4.2",
         "nyc": "^15.1.0",
         "os-browserify": "^0.3.0",
         "path-browserify": "^1.0.1",
@@ -58724,6 +58725,7 @@
         "mongodb": "^6.8.0",
         "mongodb-connection-string-url": "^3.0.1",
         "mongodb-data-service": "^22.23.1",
+        "mongodb-ns": "^2.4.2",
         "nyc": "^15.1.0",
         "os-browserify": "^0.3.0",
         "path-browserify": "^1.0.1",
diff --git a/packages/compass-components/src/components/workspace-tabs/tab.tsx b/packages/compass-components/src/components/workspace-tabs/tab.tsx
index 7b5369e8f20..c3316a5549f 100644
--- a/packages/compass-components/src/components/workspace-tabs/tab.tsx
+++ b/packages/compass-components/src/components/workspace-tabs/tab.tsx
@@ -239,6 +239,10 @@ function Tab({
   return (
     <Tooltip
       enabled={!!tooltip}
+      // To make sure that tooltips are always on the bottom of the tab in
+      // compass-web and are not hidden by the mms top navigation bar
+      align="bottom"
+      justify="start"
       trigger={
         <div
           ref={setNodeRef}
diff --git a/packages/compass-web/package.json b/packages/compass-web/package.json
index 9bc930420cf..e238ba5b1c2 100644
--- a/packages/compass-web/package.json
+++ b/packages/compass-web/package.json
@@ -120,6 +120,7 @@
     "mongodb": "^6.8.0",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.23.1",
+    "mongodb-ns": "^2.4.2",
     "nyc": "^15.1.0",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
diff --git a/packages/compass-web/src/url-builder.spec.ts b/packages/compass-web/src/url-builder.spec.ts
new file mode 100644
index 00000000000..264bf0d40a0
--- /dev/null
+++ b/packages/compass-web/src/url-builder.spec.ts
@@ -0,0 +1,97 @@
+import { expect } from 'chai';
+import {
+  getRouteFromWorkspaceTab,
+  getWorkspaceTabFromRoute,
+} from './url-builder';
+
+describe('url builder helpers', function () {
+  describe('getRouteFromWorkspaceTab', function () {
+    const specs = [
+      ['Welcome', '/', null],
+      ['Databases', '/Cluster0', null],
+      ['Collections', '/Cluster0/%23db', { namespace: '#db' }],
+      ['Collection', '/Cluster0/%23db/coll', { namespace: '#db.coll' }],
+      [
+        'Collection',
+        '/Cluster0/%23db/coll/find',
+        { namespace: '#db.coll', initialSubtab: 'Documents' },
+      ],
+      [
+        'Collection',
+        '/Cluster0/%23db/coll/aggregation',
+        { namespace: '#db.coll', initialSubtab: 'Aggregations' },
+      ],
+      [
+        'Collection',
+        '/Cluster0/%23db/coll/schema',
+        { namespace: '#db.coll', initialSubtab: 'Schema' },
+      ],
+      [
+        'Collection',
+        '/Cluster0/%23db/coll/indexes',
+        { namespace: '#db.coll', initialSubtab: 'Indexes' },
+      ],
+      [
+        'Collection',
+        '/Cluster0/%23db/coll/validation',
+        { namespace: '#db.coll', initialSubtab: 'Validation' },
+      ],
+      ['Collection', '/Cluster0/%23db/coll/foobar', { namespace: '#db.coll' }],
+    ] as const;
+
+    for (const [type, route, extraParams] of specs) {
+      it(`should return ${type} workspace when initial route is ${route}`, function () {
+        expect(getWorkspaceTabFromRoute(route)).to.deep.eq({
+          type,
+          ...(type !== 'Welcome' && { connectionId: 'Cluster0' }),
+          ...extraParams,
+        });
+      });
+    }
+  });
+
+  describe('getRouteFromWorkspaceTab', function () {
+    const specs = [
+      ['/', { type: 'Welcome' }],
+      ['/Cluster0', { type: 'Databases' }],
+      ['/Cluster0/db', { type: 'Collections', namespace: 'db' }],
+      ['/Cluster0/db/%23coll', { type: 'Collection', namespace: 'db.#coll' }],
+      [
+        '/Cluster0/db/%23coll/find',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'Documents' },
+      ],
+      [
+        '/Cluster0/db/%23coll/aggregation',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'Aggregations' },
+      ],
+      [
+        '/Cluster0/db/%23coll/schema',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'Schema' },
+      ],
+      [
+        '/Cluster0/db/%23coll/indexes',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'Indexes' },
+      ],
+      [
+        '/Cluster0/db/%23coll/validation',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'Validation' },
+      ],
+      [
+        '/Cluster0/db/%23coll',
+        { type: 'Collection', namespace: 'db.#coll', subTab: 'FooBar' },
+      ],
+    ] as const;
+
+    for (const [route, workspace] of specs) {
+      it(`should return ${route} route when workspace is ${workspace.type}`, function () {
+        expect(
+          getRouteFromWorkspaceTab(
+            workspace.type === 'Welcome'
+              ? workspace
+              : ({ ...workspace, connectionId: 'Cluster0' } as any)
+          )
+        ).to.eq(route);
+      });
+    }
+  });
+});
diff --git a/packages/compass-web/src/url-builder.ts b/packages/compass-web/src/url-builder.ts
index d48e87eea42..646e2a3ed3b 100644
--- a/packages/compass-web/src/url-builder.ts
+++ b/packages/compass-web/src/url-builder.ts
@@ -3,42 +3,67 @@ import type {
   OpenWorkspaceOptions,
   WorkspaceTab,
 } from '@mongodb-js/compass-workspaces';
+import toNS from 'mongodb-ns';
 
-function getCollectionSubTabFromRoute(subTab?: string): CollectionSubtab {
-  switch (subTab?.toLowerCase() ?? '') {
+/**
+ * This is specifically mapping from existing data explorer route params to
+ * compass types, hence some routes not exactly matching the tab names
+ */
+function getCollectionSubTabFromRoute(
+  routeSubTab: string | undefined
+): CollectionSubtab | undefined {
+  switch (routeSubTab) {
+    case 'find':
+      return 'Documents';
+    case 'aggregation':
+      return 'Aggregations';
     case 'schema':
       return 'Schema';
     case 'indexes':
       return 'Indexes';
-    case 'aggregations':
-      return 'Aggregations';
     case 'validation':
       return 'Validation';
     default:
-      return 'Documents';
+      return undefined;
+  }
+}
+
+function getRouteFromCollectionSubTab(subTab: CollectionSubtab): string {
+  switch (subTab) {
+    case 'Documents':
+      return 'find';
+    case 'Aggregations':
+      return 'aggregation';
+    case 'Schema':
+      return 'schema';
+    case 'Indexes':
+      return 'indexes';
+    case 'Validation':
+      return 'validation';
+    default:
+      return '';
   }
 }
 
 export function getWorkspaceTabFromRoute(
   route: string
 ): OpenWorkspaceOptions | null {
-  const [, connectionId, tab, namespace = '', subTab] =
+  const [, connectionId, db, coll, subTab] =
     decodeURIComponent(route).split('/');
 
-  if (namespace) {
-    if (tab === 'collection') {
-      return {
-        type: 'Collection',
-        connectionId,
-        namespace,
-        initialSubtab: getCollectionSubTabFromRoute(subTab),
-      };
-    }
-    if (tab === 'collections') {
-      return { type: 'Collections', connectionId, namespace };
-    }
+  if (connectionId && db && coll) {
+    const maybeSubTab = getCollectionSubTabFromRoute(subTab);
+    return {
+      type: 'Collection',
+      connectionId,
+      namespace: `${db}.${coll}`,
+      ...(maybeSubTab && { initialSubtab: maybeSubTab }),
+    };
   }
-  if (connectionId && (tab === 'databases' || !tab)) {
+  if (connectionId && db) {
+    return { type: 'Collections', connectionId, namespace: db };
+  }
+  if (connectionId) {
     return { type: 'Databases', connectionId };
   }
   return { type: 'Welcome' };
@@ -51,6 +76,7 @@ function buildAbsoluteURL(...parts: string[]) {
       .map((part) => {
         return encodeURIComponent(part);
       })
+      .filter(Boolean)
       .join('/')
   );
 }
@@ -59,19 +85,22 @@ export function getRouteFromWorkspaceTab(tab: WorkspaceTab | null) {
   let route: string;
   switch (tab?.type) {
     case 'Databases':
-      route = buildAbsoluteURL(tab.connectionId, 'databases');
+      route = buildAbsoluteURL(tab.connectionId);
       break;
-    case 'Collections':
-      route = buildAbsoluteURL(tab.connectionId, 'collections', tab.namespace);
+    case 'Collections': {
+      route = buildAbsoluteURL(tab.connectionId, tab.namespace);
       break;
-    case 'Collection':
+    }
+    case 'Collection': {
+      const { database, collection } = toNS(tab.namespace);
       route = buildAbsoluteURL(
         tab.connectionId,
-        'collection',
-        tab.namespace,
-        tab.subTab.toLowerCase()
+        database,
+        collection,
+        getRouteFromCollectionSubTab(tab.subTab)
       );
       break;
+    }
     default:
       route = '/';
   }