diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eef1db1..48b81a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: "^1.19.2"
+          go-version: "^1.21.2"
       - run: go version
 
       - name: Setup Node.js
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index da7b81b..9887017 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
     <HTMLCodeStyleSettings>
       <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="HTML_ENFORCE_QUOTES" value="true" />
diff --git a/Taskfile.Development.yaml b/Taskfile.Development.yaml
index a0baf8a..a552935 100644
--- a/Taskfile.Development.yaml
+++ b/Taskfile.Development.yaml
@@ -48,6 +48,8 @@ tasks:
   client:
     desc: Run OpenBooks React Client Application in Development Mode.
     dir: server/app
+    env:
+      MOCK_SERVERS: true
     cmds:
       - npm run dev
 
diff --git a/cmd/mock/main.go b/cmd/mock/main.go
index 3382094..a0817f1 100644
--- a/cmd/mock/main.go
+++ b/cmd/mock/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"github.com/evan-buss/openbooks/mock"
-	"log"
 	"os"
 	"os/signal"
 )
@@ -17,8 +16,16 @@ func main() {
 	//}
 
 	//Start mock book operator
-	operator := mock.NewOperator(&mock.Config{
-		Server: "localhost:6667",
+	highwayOp := mock.NewOperator(&mock.Config{
+		Server:  "localhost:6667",
+		Name:    "search",
+		Channel: "#ebooks",
+	})
+
+	undernetOp := mock.NewOperator(&mock.Config{
+		Server:  "localhost:6667",
+		Name:    "search2",
+		Channel: "#bookz",
 	})
 
 	go func() {
@@ -28,5 +35,8 @@ func main() {
 		cancel()
 	}()
 
-	log.Fatal(operator.StartListening(ctx))
+	go highwayOp.StartListening(ctx)
+	go undernetOp.StartListening(ctx)
+
+	<-ctx.Done()
 }
diff --git a/cmd/openbooks/main.go b/cmd/openbooks/main.go
index 0c21962..74a69f0 100644
--- a/cmd/openbooks/main.go
+++ b/cmd/openbooks/main.go
@@ -37,8 +37,6 @@ func init() {
 	desktopCmd.PersistentFlags().BoolVar(&debug, "debug", false, "Enable debug mode.")
 	desktopCmd.PersistentFlags().StringVarP(&globalFlags.UserName, "name", "n", "", "Username used to connect to IRC server.")
 	desktopCmd.MarkPersistentFlagRequired("name")
-	desktopCmd.PersistentFlags().StringVarP(&globalFlags.Server, "server", "s", "irc.irchighway.net:6697", "IRC server to connect to.")
-	desktopCmd.PersistentFlags().BoolVar(&globalFlags.EnableTLS, "tls", true, "Connect to server using TLS.")
 	desktopCmd.PersistentFlags().BoolVarP(&globalFlags.Log, "log", "l", false, "Save raw IRC logs for each client connection.")
 	desktopCmd.PersistentFlags().StringVar(&globalFlags.SearchBot, "searchbot", "search", "The IRC bot that handles search queries. Try 'searchook' if 'search' is down.")
 	desktopCmd.PersistentFlags().StringVarP(&globalFlags.UserAgent, "useragent", "u", fmt.Sprintf("OpenBooks %s", ircVersion), "UserAgent / Version Reported to IRC Server.")
@@ -58,6 +56,9 @@ var desktopCmd = &cobra.Command{
 	Use:   "openbooks",
 	Short: "Quickly and easily download eBooks from IRCHighway.",
 	Long:  "Runs OpenBooks in desktop mode. This allows you to run OpenBooks like a regular desktop application. This functionality utilizes your OS's native browser renderer and as such may not work on certain operating systems.",
+	FParseErrWhitelist: cobra.FParseErrWhitelist{
+		UnknownFlags: true, // Don't error on unknown flags. Users updating to new version may have old flags.
+	},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		bindGlobalServerFlags(&desktopConfig)
 		rateLimit, _ := cmd.Flags().GetInt("rate-limit")
diff --git a/cmd/openbooks/server.go b/cmd/openbooks/server.go
index d7afc2c..a0f227f 100644
--- a/cmd/openbooks/server.go
+++ b/cmd/openbooks/server.go
@@ -19,7 +19,7 @@ func init() {
 
 	serverCmd.Flags().StringVarP(&serverConfig.Port, "port", "p", "5228", "Set the local network port for browser mode.")
 	serverCmd.Flags().IntP("rate-limit", "r", 10, "The number of seconds to wait between searches to reduce strain on IRC search servers. Minimum is 10 seconds.")
-	serverCmd.Flags().BoolVar(&serverConfig.DisableBrowserDownloads, "no-browser-downloads", false, "The browser won't recieve and download eBook files, but they are still saved to the defined 'dir' path.")
+	serverCmd.Flags().BoolVar(&serverConfig.DisableBrowserDownloads, "no-browser-downloads", false, "The browser won't receive and download eBook files, but they are still saved to the defined 'dir' path.")
 	serverCmd.Flags().StringVar(&serverConfig.Basepath, "basepath", "/", `Base path where the application is accessible. For example "/openbooks/".`)
 	serverCmd.Flags().BoolVarP(&openBrowser, "browser", "b", false, "Open the browser on server start.")
 	serverCmd.Flags().BoolVar(&serverConfig.Persist, "persist", false, "Persist eBooks in 'dir'. Default is to delete after sending.")
@@ -30,6 +30,9 @@ var serverCmd = &cobra.Command{
 	Use:   "server",
 	Short: "Run OpenBooks in server mode.",
 	Long:  "Run OpenBooks in server mode. This allows you to use a web interface to search and download eBooks.",
+	FParseErrWhitelist: cobra.FParseErrWhitelist{
+		UnknownFlags: true, // Don't error on unknown flags. Users updating to new version may have old flags.
+	},
 	PreRun: func(cmd *cobra.Command, args []string) {
 		bindGlobalServerFlags(&serverConfig)
 		rateLimit, _ := cmd.Flags().GetInt("rate-limit")
diff --git a/cmd/openbooks/util.go b/cmd/openbooks/util.go
index 6a13691..df9849a 100644
--- a/cmd/openbooks/util.go
+++ b/cmd/openbooks/util.go
@@ -12,9 +12,7 @@ func bindGlobalServerFlags(config *server.Config) {
 	config.UserAgent = globalFlags.UserAgent
 	config.UserName = globalFlags.UserName
 	config.Log = globalFlags.Log
-	config.Server = globalFlags.Server
 	config.SearchBot = globalFlags.SearchBot
-	config.EnableTLS = globalFlags.EnableTLS
 }
 
 // Make sure the server config has a valid rate limit.
diff --git a/core/irchighway.go b/core/irchighway.go
index 0b18d6a..72030bb 100644
--- a/core/irchighway.go
+++ b/core/irchighway.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Specific irc.irchighway.net commands
-// Also works with Unanet as they use the same operator software
+// Also works with Undernet as they use the same operator software
 
 // Join connects to the irc.irchighway.net server and joins the #ebooks channel
 func Join(irc *irc.Conn, address string, channel string, enableTLS bool) error {
diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index a8863c2..efe1c2a 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -1,3 +1,17 @@
+# [v5.0.0] - 2023-10-08
+
+## Added
+- The browser application now supports multiple servers. Click the connection icon in the bottom left to select a server.
+- Results Grid Changes:
+  - Added fuzzy search
+  - Can show and hide columns
+  - New filter UI
+
+## Removed
+- No longer supports CLI mode. This mode was a holdover from the original version of OpenBooks, which was a command line application.
+- `--server` and `--tls` flags are removed. The browser application allows switching between servers and toggling TLS.
+  - OpenBooks can now connect to  the Undernet #bookz channel, as this uses the same IRC operator software as IRC Highway.
+
 # [v4.5.0] - 2023-01-08
 
 ## Added
diff --git a/irc/irc.go b/irc/irc.go
index 0efae5f..e4cfe37 100644
--- a/irc/irc.go
+++ b/irc/irc.go
@@ -2,10 +2,13 @@ package irc
 
 import (
 	"crypto/tls"
+	"errors"
 	"log/slog"
 	"net"
 )
 
+var ErrTLSHandshake = errors.New("TLS handshake failed. The server may not support TLS")
+
 // Conn represents an IRC connection to a server
 type Conn struct {
 	net.Conn
@@ -42,6 +45,9 @@ func (i *Conn) Connect(address string, enableTLS bool) error {
 	}
 
 	if err != nil {
+		if err.Error() == "tls: first record does not look like a TLS handshake" {
+			return ErrTLSHandshake
+		}
 		return err
 	}
 
diff --git a/mock/operator.go b/mock/operator.go
index 329f34b..356b392 100644
--- a/mock/operator.go
+++ b/mock/operator.go
@@ -2,6 +2,7 @@ package mock
 
 import (
 	"context"
+	"fmt"
 	"gopkg.in/irc.v4"
 	"log"
 	"math/rand"
@@ -13,8 +14,10 @@ import (
 
 type Config struct {
 	Server           string
+	Channel          string
 	SearchResultPath string
 	BookResultPath   string
+	Name             string
 }
 
 // Operator listens to an IRC channel and responds to search / download requests
@@ -34,14 +37,14 @@ func NewOperator(config *Config) *Operator {
 	operator := &Operator{
 		config:     config,
 		dccManager: NewDccManager(),
-		log:        log.New(os.Stdout, "OPERATOR: ", 0),
+		log:        log.New(os.Stdout, fmt.Sprintf("OPERATOR %s: ", config.Channel), 0),
 	}
 
 	client := irc.NewClient(conn, irc.ClientConfig{
-		Nick:           "search",
+		Nick:           config.Name,
 		Pass:           "",
-		User:           "search",
-		Name:           "search",
+		User:           config.Name,
+		Name:           config.Name,
 		EnableISupport: true,
 		EnableTracker:  true,
 		PingFrequency:  time.Second * 30,
@@ -90,10 +93,11 @@ func (o *Operator) Handler(client *irc.Client, message *irc.Message) {
 }
 
 func (o *Operator) StartListening(ctx context.Context) error {
+	fmt.Println("Starting operator")
 	go func() {
 		time.Sleep(time.Second * 2)
-		o.client.Write("JOIN #ebooks")
-		o.log.Println("Joined #ebooks channel")
+		o.client.Write("JOIN " + o.config.Channel)
+		o.log.Printf("Joined %s channel\n", o.config.Channel)
 	}()
 
 	o.log.Printf("Connected to %s\n", o.config.Server)
diff --git a/server/app/.env.development b/server/app/.env.development
index e79691b..13b37f9 100644
--- a/server/app/.env.development
+++ b/server/app/.env.development
@@ -1 +1 @@
-VITE_MOCK_IRC_SERVERS=true
\ No newline at end of file
+VITE_MOCK_IRC_SERVERS=${MOCK_SERVERS:-true}
\ No newline at end of file
diff --git a/server/app/src/App.tsx b/server/app/src/App.tsx
index 8c2bcc9..49c7b10 100644
--- a/server/app/src/App.tsx
+++ b/server/app/src/App.tsx
@@ -29,6 +29,7 @@ import "@mantine/core/styles/ActionIcon.css";
 import "@mantine/core/styles/AppShell.css";
 import "@mantine/core/styles/Badge.css";
 import "@mantine/core/styles/Center.css";
+import "@mantine/core/styles/Code.css";
 import "@mantine/core/styles/Divider.css";
 import "@mantine/core/styles/Image.css";
 import "@mantine/core/styles/Indicator.css";
diff --git a/server/app/src/components/sidebar/ServerMenu.module.css b/server/app/src/components/sidebar/ServerMenu.module.css
index 9ffc7ab..a5685a4 100644
--- a/server/app/src/components/sidebar/ServerMenu.module.css
+++ b/server/app/src/components/sidebar/ServerMenu.module.css
@@ -37,33 +37,4 @@
     .switch {
         display: none;
     }
-}
-
-
-/*
-//.root {
-//    background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-//    border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-gray-8));
-//
-//    &[data-active] {
-//        border-color: var(--mantine-primary-color-filled);
-//        box-shadow: var(--mantine-shadow-sm);
-//    }
-//
-//    @mixin hover {
-//        background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-//    }
-//}
-//
-//.inner {
-//    color: light-dark(black, white);
-//    font-weight: normal;
-//    justify-content: space-between;
-//}
-//
-//.label {
-//    padding-left: var(--mantine-spacing-sm);
-//    width: 100%;
-//    text-align: start;
-//    font-size: var(--mantine-font-size-sm);
-//}*/
+}
\ No newline at end of file
diff --git a/server/app/src/components/sidebar/ServerMenu.tsx b/server/app/src/components/sidebar/ServerMenu.tsx
index 7209820..a4c21fa 100644
--- a/server/app/src/components/sidebar/ServerMenu.tsx
+++ b/server/app/src/components/sidebar/ServerMenu.tsx
@@ -1,6 +1,7 @@
 import {
   ActionIcon,
   Button,
+  Code,
   Group,
   Modal,
   px,
@@ -9,18 +10,24 @@ import {
   Text,
   Tooltip
 } from "@mantine/core";
-import { CheckCircle, Plugs, PlugsConnected } from "@phosphor-icons/react";
+import {
+  CheckCircle,
+  Plugs,
+  PlugsConnected,
+  ShieldCheck,
+  ShieldSlash
+} from "@phosphor-icons/react";
 import { useId, useState } from "react";
 import classes from "./ServerMenu.module.css";
 import { useDisclosure } from "@mantine/hooks";
 import { useAppDispatch, useAppSelector } from "../../state/store";
 import {
-  connectToServer,
   IrcServer,
   SelectedServer,
-  selectServer
+  setIrcServer
 } from "../../state/connectionSlice";
-import isEqual from "lodash/isEqual";
+import { setActiveItem } from "../../state/stateSlice";
+import { connectToServer } from "../../state/socketMiddleware";
 
 export function ServerMenu({ connected }: { connected: boolean }) {
   const [opened, { open, close }] = useDisclosure(false);
@@ -37,7 +44,8 @@ export function ServerMenu({ connected }: { connected: boolean }) {
   };
 
   const handleConnect = () => {
-    dispatch(selectServer(selected));
+    dispatch(setActiveItem(null));
+    dispatch(setIrcServer(selected));
     dispatch(connectToServer());
     close();
   };
@@ -57,14 +65,12 @@ export function ServerMenu({ connected }: { connected: boolean }) {
               key={server.name}
               server={server}
               isSelected={selected.name === server.name}
+              isTLSEnabled={selectedServer.enableTLS}
               onSelect={(ssl) => handleSelect(server, ssl)}
             />
           ))}
-          <Button
-            style={{ alignSelf: "end" }}
-            disabled={isEqual(selectedServer, selected)}
-            onClick={handleConnect}>
-            Connect
+          <Button style={{ alignSelf: "end" }} onClick={handleConnect}>
+            {selectedServer.name === selected.name ? "Reconnect" : "Connect"}
           </Button>
         </Stack>
       </Modal>
@@ -75,12 +81,18 @@ export function ServerMenu({ connected }: { connected: boolean }) {
 interface ServerOptionProps {
   server: IrcServer;
   isSelected: boolean;
+  isTLSEnabled: boolean;
   onSelect: (ssl: boolean) => void;
 }
 
-function ServerOption({ server, isSelected, onSelect }: ServerOptionProps) {
+function ServerOption({
+  server,
+  isSelected,
+  isTLSEnabled,
+  onSelect
+}: ServerOptionProps) {
   const id = useId();
-  const [enableTLS, setEnableTLS] = useState(true);
+  const [enableTLS, setEnableTLS] = useState(isTLSEnabled);
   const serverString = `${server.address}:${
     enableTLS ? server.sslPort : server.port
   }`;
@@ -110,24 +122,37 @@ function ServerOption({ server, isSelected, onSelect }: ServerOptionProps) {
         <Group gap={12} align="center">
           <CheckCircle size={20} weight="bold" className={classes.icon} />
           <Stack gap={0}>
-            <Text>{server.name}</Text>
+            <Text size="md" fw={500}>
+              {server.name} <Code>#{server.channel}</Code>
+            </Text>
             <Tooltip position="right" label={serverString}>
               <Text c="gray.5">{server.address}</Text>
             </Tooltip>
           </Stack>
         </Group>
 
-        <div>
+        <Tooltip
+          label={enableTLS ? "TLS Enabled" : "TLS Disabled"}
+          refProp="rootRef">
           <Switch
+            aria-label="Enable TLS?"
             className={classes.switch}
             defaultChecked
-            size="xs"
-            w={100}
+            labelPosition="right"
+            size="lg"
+            onLabel="ON"
+            offLabel="OFF"
+            thumbIcon={
+              enableTLS ? (
+                <ShieldCheck weight="bold" color="black" size={14} />
+              ) : (
+                <ShieldSlash weight="bold" color="black" size={14} />
+              )
+            }
             checked={enableTLS}
             onChange={(e) => handleTLSChange(e.currentTarget.checked)}
-            label="TLS?"
           />
-        </div>
+        </Tooltip>
       </label>
     </div>
   );
diff --git a/server/app/src/components/sidebar/Sidebar.tsx b/server/app/src/components/sidebar/Sidebar.tsx
index f03f4f3..2886ff9 100644
--- a/server/app/src/components/sidebar/Sidebar.tsx
+++ b/server/app/src/components/sidebar/Sidebar.tsx
@@ -22,6 +22,7 @@ import History from "./History";
 import Library from "./Library";
 import classes from "./Sidebar.module.css";
 import { ServerMenu } from "./ServerMenu";
+import { selectActiveIrcServer } from "../../state/connectionSlice";
 
 export default function Sidebar() {
   const { colorScheme, toggleColorScheme } = useMantineColorScheme();
@@ -29,9 +30,7 @@ export default function Sidebar() {
   const dispatch = useAppDispatch();
   const connected = useAppSelector((store) => store.state.isConnected);
   const username = useAppSelector((store) => store.state.username);
-  const serverName = useAppSelector(
-    (store) => store.connection.selectedServer.name
-  );
+  const activeServer = useAppSelector(selectActiveIrcServer);
 
   const [index, setIndex] = useLocalStorage<"books" | "history">({
     key: "sidebar-state",
@@ -68,7 +67,10 @@ export default function Sidebar() {
         </Group>
 
         <Text size="sm" c="dimmed">
-          Download eBooks from {serverName}
+          Download eBooks from
+          <Tooltip label={`#${activeServer.channel}`}>
+            <span> {activeServer.name}</span>
+          </Tooltip>
         </Text>
 
         <SegmentedControl
diff --git a/server/app/src/components/tables/BookTable.tsx b/server/app/src/components/tables/BookTable.tsx
index a400515..cf57e8d 100644
--- a/server/app/src/components/tables/BookTable.tsx
+++ b/server/app/src/components/tables/BookTable.tsx
@@ -4,7 +4,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import { useSelector } from "react-redux";
 import { useGetServersQuery } from "../../state/api";
 import { BookDetail } from "../../state/messages";
-import { sendDownload } from "../../state/stateSlice";
+import { sendDownload } from "../../state/socketMiddleware";
 import { RootState, useAppDispatch } from "../../state/store";
 import { DataTableColumnHeader } from "./DataTable/ColumnHeader";
 import DataTable from "./DataTable/DataTable";
diff --git a/server/app/src/pages/SearchPage.tsx b/server/app/src/pages/SearchPage.tsx
index 56e3160..91b86ee 100644
--- a/server/app/src/pages/SearchPage.tsx
+++ b/server/app/src/pages/SearchPage.tsx
@@ -14,11 +14,11 @@ import { MagnifyingGlass, Sidebar, Warning } from "@phosphor-icons/react";
 import image from "../assets/reading.svg";
 import BookTable from "../components/tables/BookTable";
 import ErrorTable from "../components/tables/ErrorTable";
-import { MessageType } from "../state/messages";
-import { sendMessage, sendSearch, toggleSidebar } from "../state/stateSlice";
+import { toggleSidebar } from "../state/stateSlice";
 import { useAppDispatch, useAppSelector } from "../state/store";
 import classes from "./SearchPage.module.css";
 import { conditionalAttribute } from "../utils/attribute-helper";
+import { sendDownload, sendSearch } from "../state/socketMiddleware";
 
 export default function SearchPage() {
   const dispatch = useAppDispatch();
@@ -44,12 +44,7 @@ export default function SearchPage() {
     event.preventDefault();
 
     if (errorMode) {
-      dispatch(
-        sendMessage({
-          type: MessageType.DOWNLOAD,
-          payload: { book: searchQuery }
-        })
-      );
+      dispatch(sendDownload(searchQuery));
     } else {
       dispatch(sendSearch(searchQuery));
     }
diff --git a/server/app/src/state/connectionSlice.ts b/server/app/src/state/connectionSlice.ts
index 66a702a..443eb14 100644
--- a/server/app/src/state/connectionSlice.ts
+++ b/server/app/src/state/connectionSlice.ts
@@ -1,7 +1,5 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { createSelector, createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { RootState } from "./store";
-import { sendMessage } from "./stateSlice";
-import { MessageType } from "./messages";
 
 export interface IrcServer {
   name: string;
@@ -32,7 +30,11 @@ const loadConnection = (): SelectedServer => {
 
 const initialState = (): ConnectionState => {
   const useMockServers = import.meta.env.VITE_MOCK_IRC_SERVERS;
-  console.log("Using mock servers? ", useMockServers);
+  if (useMockServers) {
+    console.info("Using MOCK IRC servers");
+  } else {
+    console.warn("Using LIVE IRC servers");
+  }
   return {
     selectedServer: loadConnection(),
     servers: [
@@ -56,38 +58,24 @@ const initialState = (): ConnectionState => {
 
 const connectionSlice = createSlice({
   name: "connection",
-  initialState,
+  initialState: initialState(),
   reducers: {
-    selectServer(state, action: PayloadAction<SelectedServer>) {
+    setIrcServer(state, action: PayloadAction<SelectedServer>) {
       state.selectedServer = action.payload;
     }
   }
 });
 
-const activeIrcServer = ({
-  connection: { servers, selectedServer }
-}: RootState): IrcServer & { enableTLS: boolean } => {
-  const server = servers.find((x) => x.name === selectedServer.name)!;
-  return { ...server, enableTLS: selectedServer.enableTLS };
-};
+const selectConnection = (state: RootState) => state.connection;
 
-const connectToServer = createAsyncThunk(
-  "connection/connect_to_server",
-  async (_, { dispatch, getState }) => {
-    const { address, port, channel, enableTLS } = activeIrcServer(
-      getState() as RootState
-    );
-    dispatch(
-      sendMessage({
-        type: MessageType.CONNECT,
-        payload: { address: `${address}:${port}`, channel, enableTLS }
-      })
-    );
+const selectActiveIrcServer = createSelector(
+  selectConnection,
+  ({ servers, selectedServer }) => {
+    const server = servers.find((x) => x.name === selectedServer.name)!;
+    return { ...server, enableTLS: selectedServer.enableTLS };
   }
 );
 
-const { selectServer } = connectionSlice.actions;
-
-export { connectionSlice, selectServer, connectToServer, activeIrcServer };
-
+export const { setIrcServer } = connectionSlice.actions;
+export { connectionSlice, selectActiveIrcServer };
 export default connectionSlice.reducer;
diff --git a/server/app/src/state/historySlice.ts b/server/app/src/state/historySlice.ts
index 070a4f6..a3fb258 100644
--- a/server/app/src/state/historySlice.ts
+++ b/server/app/src/state/historySlice.ts
@@ -1,15 +1,22 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import {
+  createAsyncThunk,
+  createSelector,
+  createSlice,
+  PayloadAction
+} from "@reduxjs/toolkit";
 import { BookDetail, ParseError } from "./messages";
 import { setActiveItem } from "./stateSlice";
 import { AppDispatch, RootState } from "./store";
+import { selectActiveIrcServer } from "./connectionSlice";
 
 // HistoryItem represents a single search history item
-type HistoryItem = {
+export interface HistoryItem {
+  serverName: string;
   query: string;
   timestamp: number;
   results?: BookDetail[];
   errors?: ParseError[];
-};
+}
 
 interface HistoryState {
   items: HistoryItem[];
@@ -46,6 +53,9 @@ export const historySlice = createSlice({
         action.payload,
         ...state.items.slice(pendingItemIndex + 1)
       ];
+    },
+    setHistory: (state, action: PayloadAction<HistoryItem[]>) => {
+      state.items = action.payload;
     }
   }
 });
@@ -73,11 +83,13 @@ const deleteHistoryItem = createAsyncThunk<
   dispatch(historySlice.actions.deleteByTimetamp(timeStamp));
 });
 
-const { addHistoryItem, updateHistoryItem } = historySlice.actions;
-
-const selectHistory = (state: RootState) => state.history.items;
-
-export type { HistoryItem };
-export { deleteHistoryItem, addHistoryItem, updateHistoryItem, selectHistory };
+const selectAll = (state: RootState) => state.history.items;
+const selectHistory = createSelector(
+  [selectAll, selectActiveIrcServer],
+  (history, server) => history.filter((x) => x.serverName === server.name)
+);
 
+export const { addHistoryItem, updateHistoryItem, setHistory } =
+  historySlice.actions;
+export { deleteHistoryItem, selectHistory };
 export default historySlice.reducer;
diff --git a/server/app/src/state/socketMiddleware.ts b/server/app/src/state/socketMiddleware.ts
index 7a3160c..3b7f7d2 100644
--- a/server/app/src/state/socketMiddleware.ts
+++ b/server/app/src/state/socketMiddleware.ts
@@ -1,11 +1,17 @@
 import {
   createAction,
+  createAsyncThunk,
   Middleware,
   MiddlewareAPI,
   PayloadAction
 } from "@reduxjs/toolkit";
 import { openbooksApi } from "./api";
-import { deleteHistoryItem } from "./historySlice";
+import {
+  addHistoryItem,
+  deleteHistoryItem,
+  HistoryItem,
+  updateHistoryItem
+} from "./historySlice";
 import {
   ConnectionResponse,
   DownloadResponse,
@@ -18,17 +24,18 @@ import {
 } from "./messages";
 import { addNotification } from "./notificationSlice";
 import {
+  addInFlightDownload,
   removeInFlightDownload,
+  setActiveItem,
   setConnectionState,
-  setSearchResults,
   setUsername
 } from "./stateSlice";
 import { AppDispatch, RootState } from "./store";
 import { displayNotification, downloadFile } from "./util";
-import { connectToServer } from "./connectionSlice";
+import { selectActiveIrcServer } from "./connectionSlice";
 
 // Action to send a websocket message to the server
-export const sendMessage = createAction<RequestMessage>("socket/send_message");
+const sendMessage = createAction<RequestMessage>("socket/send_message");
 
 // Web socket redux middleware.
 // Listens to socket and dispatches handlers.
@@ -114,3 +121,80 @@ const route = (dispatch: AppDispatch, msg: MessageEvent<string>): void => {
   dispatch(addNotification(notification));
   displayNotification(notification);
 };
+
+export const sendDownload = createAsyncThunk(
+  "state/send_download",
+  (book: string, { dispatch }) => {
+    dispatch(addInFlightDownload(book));
+    dispatch(
+      sendMessage({
+        type: MessageType.DOWNLOAD,
+        payload: { book }
+      })
+    );
+  }
+);
+
+// Send a search to the server. Add to query history and set loading.
+export const sendSearch = createAsyncThunk(
+  "state/send_sendSearch",
+  (queryString: string, { dispatch, getState }) => {
+    // Send the books search query to the server
+    dispatch(
+      sendMessage({
+        type: MessageType.SEARCH,
+        payload: {
+          query: queryString
+        }
+      })
+    );
+
+    const timestamp = new Date().getTime();
+    const serverName = (getState() as RootState).connection.selectedServer.name;
+
+    // Add query to item history.
+    dispatch(addHistoryItem({ query: queryString, timestamp, serverName }));
+    dispatch(
+      setActiveItem({ query: queryString, timestamp: timestamp, serverName })
+    );
+  }
+);
+
+export const setSearchResults = createAsyncThunk<
+  Promise<void>,
+  SearchResponse,
+  { dispatch: AppDispatch; state: RootState }
+>(
+  "state/set_search_results",
+  async ({ books, errors }: SearchResponse, { dispatch, getState }) => {
+    const activeItem = getState().state.activeItem;
+    if (activeItem === null) {
+      return;
+    }
+    const updatedItem: HistoryItem = {
+      query: activeItem.query,
+      timestamp: activeItem.timestamp,
+      serverName: activeItem.serverName,
+      results: books,
+      errors: errors
+    };
+
+    dispatch(setActiveItem(updatedItem));
+    dispatch(updateHistoryItem(updatedItem));
+  }
+);
+
+export const connectToServer = createAsyncThunk(
+  "connection/connect_to_server",
+  async (_, { dispatch, getState }) => {
+    const { address, port, channel, enableTLS } = selectActiveIrcServer(
+      getState() as RootState
+    );
+    dispatch(
+      sendMessage({
+        type: MessageType.CONNECT,
+        payload: { address: `${address}:${port}`, channel, enableTLS }
+      })
+    );
+  }
+);
diff --git a/server/app/src/state/stateSlice.ts b/server/app/src/state/stateSlice.ts
index 1f886fb..199fd83 100644
--- a/server/app/src/state/stateSlice.ts
+++ b/server/app/src/state/stateSlice.ts
@@ -1,8 +1,5 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { addHistoryItem, HistoryItem, updateHistoryItem } from "./historySlice";
-import { MessageType, SearchResponse } from "./messages";
-import { AppDispatch, RootState } from "./store";
-import { sendMessage } from "./socketMiddleware";
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { HistoryItem } from "./historySlice";
 
 interface AppState {
   // TODO: Need to differentiate websocket connection status from IRC connection status
@@ -54,64 +51,6 @@ const stateSlice = createSlice({
   }
 });
 
-const sendDownload = createAsyncThunk(
-  "state/send_download",
-  (book: string, { dispatch }) => {
-    dispatch(addInFlightDownload(book));
-    dispatch(
-      sendMessage({
-        type: MessageType.DOWNLOAD,
-        payload: { book }
-      })
-    );
-  }
-);
-
-// Send a search to the server. Add to query history and set loading.
-const sendSearch = createAsyncThunk(
-  "state/send_sendSearch",
-  (queryString: string, { dispatch }) => {
-    // Send the books search query to the server
-    dispatch(
-      sendMessage({
-        type: MessageType.SEARCH,
-        payload: {
-          query: queryString
-        }
-      })
-    );
-
-    const timestamp = new Date().getTime();
-
-    // Add query to item history.
-    dispatch(addHistoryItem({ query: queryString, timestamp }));
-    dispatch(setActiveItem({ query: queryString, timestamp: timestamp }));
-  }
-);
-
-const setSearchResults = createAsyncThunk<
-  Promise<void>,
-  SearchResponse,
-  { dispatch: AppDispatch; state: RootState }
->(
-  "state/set_search_results",
-  async ({ books, errors }: SearchResponse, { dispatch, getState }) => {
-    const activeItem = getState().state.activeItem;
-    if (activeItem === null) {
-      return;
-    }
-    const updatedItem: HistoryItem = {
-      query: activeItem.query,
-      timestamp: activeItem.timestamp,
-      results: books,
-      errors: errors
-    };
-
-    dispatch(setActiveItem(updatedItem));
-    dispatch(updateHistoryItem(updatedItem));
-  }
-);
-
 export const {
   setActiveItem,
   setConnectionState,
@@ -121,6 +60,4 @@ export const {
   toggleSidebar
 } = stateSlice.actions;
 
-export { stateSlice, sendMessage, sendDownload, sendSearch, setSearchResults };
-
 export default stateSlice.reducer;
diff --git a/server/app/src/state/store.ts b/server/app/src/state/store.ts
index d5face1..a95c838 100644
--- a/server/app/src/state/store.ts
+++ b/server/app/src/state/store.ts
@@ -4,15 +4,17 @@ import { enableMapSet } from "immer";
 import throttle from "lodash/throttle";
 import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
 import { openbooksApi } from "./api";
-import historyReducer from "./historySlice";
+import historyReducer, { setHistory } from "./historySlice";
 import notificationReducer from "./notificationSlice";
 import connectionReducer from "./connectionSlice";
 import { websocketConn } from "./socketMiddleware";
-import stateReducer from "./stateSlice";
+import stateReducer, { setActiveItem } from "./stateSlice";
 import { getWebsocketURL } from "./util";
 
 enableMapSet();
 
+const storageVersion = localStorage.getItem("version");
+
 export const store = configureStore({
   reducer: {
     state: stateReducer,
@@ -30,6 +32,30 @@ export const store = configureStore({
 
 setupListeners(store.dispatch);
 
+switch (storageVersion) {
+  case "5.0.0":
+    break;
+  default:
+    applyInitialMigration();
+}
+
+// We now need to associate each history item with a server.
+// All existing history items are associated with the "IRC Highway" server.
+function applyInitialMigration() {
+  console.log("Applying initial migration to 5.0.0");
+
+  const migrated = store.getState().history.items.map((item) => {
+    return {
+      ...item,
+      serverName: "IRC Highway"
+    };
+  });
+
+  store.dispatch(setHistory(migrated));
+  store.dispatch(setActiveItem(null));
+  localStorage.setItem("version", "5.0.0");
+}
+
 const saveState = (key: string, state: unknown): void => {
   try {
     const serialized = JSON.stringify(state);
diff --git a/server/server.go b/server/server.go
index e2cd0e0..1b2fe60 100644
--- a/server/server.go
+++ b/server/server.go
@@ -50,8 +50,6 @@ type Config struct {
 	Persist                 bool
 	DownloadDir             string
 	Basepath                string
-	Server                  string
-	EnableTLS               bool
 	SearchTimeout           time.Duration
 	SearchBot               string
 	DisableBrowserDownloads bool
diff --git a/server/websocket_requests.go b/server/websocket_requests.go
index 808b37b..2398a88 100644
--- a/server/websocket_requests.go
+++ b/server/websocket_requests.go
@@ -2,7 +2,10 @@ package server
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
+	"github.com/evan-buss/openbooks/irc"
+	"strings"
 	"time"
 
 	"github.com/evan-buss/openbooks/core"
@@ -54,10 +57,18 @@ func (c *Client) startIrcConnection(request *ConnectionRequest, server *server)
 	err := core.Join(c.irc, request.Address, request.Channel, request.EnableTLS)
 	if err != nil {
 		c.log.Println(err)
-		c.send <- newErrorResponse("Unable to connect to IRC server.")
+		if errors.Is(err, irc.ErrTLSHandshake) {
+			c.send <- newErrorResponse(err.Error())
+		} else {
+			c.send <- newErrorResponse("Unable to connect to IRC server.")
+		}
 		return
 	}
 
+	address := strings.Split(request.Address, ":")[0]
+
+	c.log.Printf("Connected to %s #%s as %s.\n", address, request.Channel, c.irc.Username)
+
 	handler := server.NewIrcEventHandler(c)
 
 	if server.config.Log {
@@ -74,7 +85,7 @@ func (c *Client) startIrcConnection(request *ConnectionRequest, server *server)
 		StatusResponse: StatusResponse{
 			MessageType:      CONNECT,
 			NotificationType: SUCCESS,
-			Title:            "Welcome, connection established.",
+			Title:            fmt.Sprintf("Connection established to %s #%s", address, request.Channel),
 			Detail:           fmt.Sprintf("IRC username %s", c.irc.Username),
 		},
 		Name: c.irc.Username,