diff --git a/src/api/ologApi.js b/src/api/ologApi.js
index 7f15179..d30f2c9 100644
--- a/src/api/ologApi.js
+++ b/src/api/ologApi.js
@@ -17,7 +17,6 @@
  */
 
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { withoutCacheBust } from "hooks/useSanitizedSearchParams";
 import customization from "config/customization";
 import { useCallback } from "react";
 
@@ -90,19 +89,14 @@ export const ologApi = createApi({
     keepUnusedDataFor: 0, // Don't cache anything
     endpoints: builder => ({
         searchLogs: builder.query({
-            query: ({searchParams, searchPageParams}) => {
-                return {
-                    url: '/logs/search',
-                    params: { 
-                        // remove cache bust so we don't send it to the server
-                        // we must do it *here* rather than where useSearchLogsQuery
-                        // is called because we want repeated searches of the same
-                        // search to trigger calling the api (e.g. polling)
-                        ...withoutCacheBust(searchParams), 
-                        ...searchPageParams
-                    }
-                }
+          query: ({query, title, desc, start, end, level, logbooks, tags, owner, attachments, from, size, sort}) => {
+            return {
+              url: '/logs/search',
+              params: { 
+                query, title, desc, start, end, level, logbooks, tags, owner, attachments, from, size, sort
+              }
             }
+          }
         }),
         getTags: builder.query({
             query: () => ({
diff --git a/src/beta/components/log/EntryTypeChip.jsx b/src/beta/components/log/EntryTypeChip.jsx
index acb8653..9f5a773 100644
--- a/src/beta/components/log/EntryTypeChip.jsx
+++ b/src/beta/components/log/EntryTypeChip.jsx
@@ -1,12 +1,12 @@
 import { Chip } from "@mui/material";
 import React from "react";
 
-export const EntryTypeChip = ({name, ...props}) => {
+export const EntryTypeChip = ({value, ...props}) => {
 
   return (
     <Chip
-      label={name} 
-      aria-label={`has logbook ${name}`} 
+      label={`type: ${value}`} 
+      aria-label={`has level ${value}`} 
       size="small"
       variant="outlined"
       color="ologBlack" 
diff --git a/src/beta/components/log/LogDetails/LogDetails.js b/src/beta/components/log/LogDetails/LogDetails.js
index 48e7bae..8a5fb23 100644
--- a/src/beta/components/log/LogDetails/LogDetails.js
+++ b/src/beta/components/log/LogDetails/LogDetails.js
@@ -38,10 +38,13 @@ const LogDetails = styled(({log, className}) => {
           }
           <Divider />
           <MetadataTable
+            ValueProps={{
+              component: "div"
+            }}
             data={{
-              Logbooks: <ChipList>{log?.logbooks?.map(it => <LogbookChip key={it.name} name={it.name} />)}</ChipList>,
-              Tags: <ChipList>{log?.tags?.map(it => <TagChip key={it.name} name={it.name} />)}</ChipList>,
-              "Entry Type": <EntryTypeChip name={log?.level} />
+              Logbooks: <ChipList>{log?.logbooks?.map(it => <LogbookChip key={it.name} value={it.name} />)}</ChipList>,
+              Tags: <ChipList>{log?.tags?.map(it => <TagChip key={it.name} value={it.name} />)}</ChipList>,
+              "Entry Type": <EntryTypeChip value={log?.level} />
             }}
           />
         </Stack>
diff --git a/src/beta/components/log/LogDetails/MetadataTable.js b/src/beta/components/log/LogDetails/MetadataTable.js
index 6acce1f..a8756a2 100644
--- a/src/beta/components/log/LogDetails/MetadataTable.js
+++ b/src/beta/components/log/LogDetails/MetadataTable.js
@@ -9,7 +9,7 @@ const Value = styled(Typography)({
     gridColumn: "span / span"
 });
 
-const MetadataTable = styled(({data, className}) => {
+const MetadataTable = styled(({data, KeyProps, ValueProps, className}) => {
 
     return (
         <Box 
@@ -22,8 +22,8 @@ const MetadataTable = styled(({data, className}) => {
         >
             {Object.entries(data).map(entry => 
                 <React.Fragment key={entry[0]}>
-                    <Key>{entry[0]}</Key>
-                    <Value>{entry[1]}</Value>
+                    <Key {...KeyProps}>{entry[0]}</Key>
+                    <Value {...ValueProps}>{entry[1]}</Value>
                 </React.Fragment>
             )}
         </Box>
diff --git a/src/beta/components/log/LogbookChip.jsx b/src/beta/components/log/LogbookChip.jsx
index 4ea0a48..2cefb97 100644
--- a/src/beta/components/log/LogbookChip.jsx
+++ b/src/beta/components/log/LogbookChip.jsx
@@ -1,11 +1,11 @@
 import React from "react";
 import { Chip } from "@mui/material";
 
-export const LogbookChip = ({name, ...props}) => {
+export const LogbookChip = ({value, ...props}) => {
   return (
     <Chip 
-      label={name} 
-      aria-label={`has logbook ${name}`} 
+      label={value} 
+      aria-label={`has logbook ${value}`} 
       size="small"
       variant="outlined"
       color="ologPurple" 
diff --git a/src/beta/components/log/TagChip.jsx b/src/beta/components/log/TagChip.jsx
index c48857d..acfc312 100644
--- a/src/beta/components/log/TagChip.jsx
+++ b/src/beta/components/log/TagChip.jsx
@@ -2,11 +2,11 @@ import React from "react";
 import LocalOfferIcon from '@mui/icons-material/LocalOffer';
 import { Chip } from "@mui/material";
 
-export const TagChip = ({name, ...props}) => {
+export const TagChip = ({value, ...props}) => {
   return (
     <Chip 
-      label={name} 
-      aria-label={`has tag ${name}`} 
+      label={value} 
+      aria-label={`has tag ${value}`} 
       icon={<LocalOfferIcon />} 
       size="small"
       variant="outlined"
diff --git a/src/beta/components/log/TextChip.jsx b/src/beta/components/log/TextChip.jsx
new file mode 100644
index 0000000..b0425d2
--- /dev/null
+++ b/src/beta/components/log/TextChip.jsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { Chip } from "@mui/material";
+
+export const TextChip = ({name, value, ...props}) => {
+  return (
+    <Chip
+      label={`${name}: ${value}`}
+      aria-label={`has ${name}: ${value}`}
+      size="small"
+      variant="outlined"
+      {...props}
+    />
+  );
+};
\ No newline at end of file
diff --git a/src/beta/components/search/AdvancedSearch.jsx b/src/beta/components/search/AdvancedSearch.jsx
new file mode 100644
index 0000000..c81387e
--- /dev/null
+++ b/src/beta/components/search/AdvancedSearch.jsx
@@ -0,0 +1,142 @@
+import React, { useEffect } from "react";
+import { Button, Stack, Typography } from "@mui/material";
+import TextInput from "components/shared/input/TextInput";
+import WizardDateInput from "components/shared/input/WizardDateInput";
+import EntryTypeSelect from "components/shared/input/managed/EntryTypeSelect";
+import LogbooksMultiSelect from "components/shared/input/managed/LogbooksMultiSelect";
+import TagsMultiSelect from "components/shared/input/managed/TagsMultiSelect";
+import { useForm, useWatch } from "react-hook-form";
+import { defaultSearchParams } from "features/searchParamsReducer";
+import FilterAltIcon from '@mui/icons-material/FilterAlt';
+
+
+const isDate = (obj) => {
+  return obj instanceof Date && !isNaN(obj);
+}
+const toDate = (dateString) => {
+  if(isDate(dateString)) {
+      return new Date(dateString);
+  } else {
+      return null;
+  }
+}
+
+export const AdvancedSearch = ({search, onSearchChange, onSearchSubmit}) => {
+
+  const values = {...defaultSearchParams, ...search};
+
+  const form = useForm({
+    defaultValues: defaultSearchParams,
+    values: values
+  });
+
+  const { control, handleSubmit, getValues } = form;
+
+  const liveValues = useWatch({control, defaultValue: values});
+
+  // send updated form values on any form change
+  useEffect(() => {
+    onSearchChange(liveValues);
+  }, [liveValues, onSearchChange]);
+
+  // invoke submit callback when submitted
+  const onSubmit = () => {
+    if (onSearchSubmit) {
+      onSearchSubmit();
+    }
+  }
+
+  return (
+    <Stack>
+      <Typography component="h2" variant="h4" id="advanced-search">Filters</Typography>
+      <Stack 
+          component="form" 
+          onSubmit={handleSubmit(onSubmit)}
+          aria-labelledby='advanced-search' role='search' 
+          gap={1}
+      >
+          <TextInput 
+              name='title'
+              label='Title'
+              control={control}
+              defaultValue=''
+          />
+          <TextInput 
+              name='desc'
+              label='Text'
+              control={control}
+              defaultValue=''
+          />
+          <EntryTypeSelect 
+              control={control}
+          />
+          <LogbooksMultiSelect 
+              control={control}
+          />
+          <TagsMultiSelect 
+              control={control}
+          />
+          <TextInput 
+              name='owner'
+              label='Author'
+              control={control}
+              defaultValue=''
+          />
+          <WizardDateInput 
+              name='start'
+              label='Start Time'
+              form={form}
+              defaultValue={getValues('start')}
+              DatePickerProps={{
+                  disableFuture: true
+              }}
+              rules={{
+                  validate: {
+                      timeParadox: val => {
+                          const startDate = toDate(val);
+                          const endDate = toDate(getValues('end'));
+                          if(startDate && endDate) {
+                              return startDate <= endDate || 'Start date cannot come after end date'
+                          } else {
+                              return true;
+                          }
+                      }
+                  }
+              }}
+          />
+          <WizardDateInput 
+              name='end'
+              label='End Time'
+              form={form}
+              defaultValue={getValues('end')}
+              DatePickerProps={{
+                  disableFuture: true
+              }}
+              rules={{
+                  validate: {
+                      timeParadox: val => {
+                          const startDate = toDate(getValues('start'));
+                          const endDate = toDate(val);
+                          if(startDate && endDate) {
+                              return endDate > startDate || 'End date cannot come before start date'
+                          } else {
+                              return true;
+                          }
+                      }
+                  }
+              }}
+          />
+          <TextInput 
+              name='attachments'
+              label='Attachments'
+              control={control}
+              defaultValue=''
+          />
+          <Stack flexDirection="row" justifyContent="flex-end">
+            <Button type="submit" variant="contained" startIcon={<FilterAltIcon />} >Apply</Button>
+          </Stack>
+      </Stack>
+    </Stack>
+  );
+
+};
\ No newline at end of file
diff --git a/src/beta/components/search/SearchParamsBadges.jsx b/src/beta/components/search/SearchParamsBadges.jsx
new file mode 100644
index 0000000..c5bbce9
--- /dev/null
+++ b/src/beta/components/search/SearchParamsBadges.jsx
@@ -0,0 +1,55 @@
+import React from "react";
+import { Stack } from "@mui/material";
+import { EntryTypeChip } from "../log/EntryTypeChip";
+import { LogbookChip } from "../log/LogbookChip";
+import { TagChip } from "../log/TagChip";
+import { TextChip } from "../log/TextChip";
+import { defaultSearchParams } from "features/searchParamsReducer";
+
+const LogbooksList = ({logbooks, onChange}) => {
+
+  const onDelete = (logbook) => {
+    const updated = logbooks.filter(it => it.name !== logbook.name);
+    onChange(updated);
+  }
+
+  return (
+    <>
+      {logbooks.map(logbook => <LogbookChip key={logbook?.name} value={logbook?.name} onDelete={() => onDelete(logbook)} />)}
+    </>
+  )
+}
+
+const TagsList = ({tags, onChange}) => {
+
+  const onDelete = (tag) => {
+    const updated = tags.filter(it => it.name !== tag.name);
+    onChange(updated);
+  }
+
+  return (
+    <>
+      {tags.map(tag => <TagChip key={tag?.name} value={tag?.name} onDelete={() => onDelete(tag)} />)}
+    </>
+  )
+}
+
+export const SearchParamsBadges = ({search, onSearch}) => {
+
+  const { title, level, desc, owner, attachments, start, end, tags, logbooks } = search;
+
+  return (
+    <Stack flexDirection="row" gap={0.5} flexWrap="wrap" padding={0.5}>
+      {title ? <TextChip name="title" value={title} onDelete={() => onSearch({...search, title: defaultSearchParams.title})} /> : null}
+      {level ? <EntryTypeChip value={level} onDelete={() => onSearch({...search, level: defaultSearchParams.level})} /> : null}
+      {desc ? <TextChip name="desc" value={desc} onDelete={() => onSearch({...search, desc: defaultSearchParams.desc})} /> : null}
+      {owner ? <TextChip name="author" value={owner} onDelete={() => onSearch({...search, owner: defaultSearchParams.owner})} /> : null}
+      {attachments ? <TextChip name="attach" value={attachments} onDelete={() => onSearch({...search, attachments: defaultSearchParams.attachments})} /> : null}
+      {start ? <TextChip name="from" value={start} onDelete={() => onSearch({...search, start: defaultSearchParams.start})} /> : null}
+      {end ? <TextChip name="to" value={end} onDelete={() => onSearch({...search, end: defaultSearchParams.end})} /> : null}
+      {tags ? <TagsList tags={tags} onChange={(val) => onSearch({...search, tags: val})} /> : null}
+      {logbooks ? <LogbooksList logbooks={logbooks} onChange={(val) => onSearch({...search, logbooks: val})} /> : null}
+    </Stack>
+  );
+
+};
\ No newline at end of file
diff --git a/src/beta/components/search/SearchResultList/AdvancedSearchDrawer.jsx b/src/beta/components/search/SearchResultList/AdvancedSearchDrawer.jsx
new file mode 100644
index 0000000..4d99a3c
--- /dev/null
+++ b/src/beta/components/search/SearchResultList/AdvancedSearchDrawer.jsx
@@ -0,0 +1,46 @@
+import { Box, Drawer } from "@mui/material";
+import { defaultSearchParams, updateSearchParams } from "features/searchParamsReducer";
+import React, { useEffect, useState } from "react";
+import { useDispatch } from "react-redux";
+import { AdvancedSearch } from "../AdvancedSearch";
+
+export const AdvancedSearchDrawer = ({searchParams, advancedSearchOpen, setAdvancedSearchOpen}) => {
+
+  const dispatch = useDispatch();
+
+  // Keep a separate local state so we can decide when to submit it
+  const [localSearchParams, setLocalSearchParams] = useState(defaultSearchParams);
+
+  // sync changes to external search params with local state
+  useEffect(() => {
+    setLocalSearchParams(searchParams);
+  }, [searchParams])
+
+  // When search changes, update local state
+  const onSearchChange = (values) => {
+    setLocalSearchParams(values);
+  }
+
+  // When closed:
+  // - close the drawer (obviously)
+  // - update the external search params state
+  const onAdvancedSearchClose = () => {
+    setAdvancedSearchOpen(false);
+    dispatch(updateSearchParams(localSearchParams));
+  }
+
+  return (
+    <Drawer
+      open={advancedSearchOpen}
+      onClose={onAdvancedSearchClose}
+    >
+      <Box padding={1}>
+        <AdvancedSearch
+          search={localSearchParams}
+          onSearchChange={onSearchChange}
+          onSearchSubmit={onAdvancedSearchClose}
+        />
+      </Box>
+    </Drawer>
+  );
+};
\ No newline at end of file
diff --git a/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx b/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx
index 8043759..a43c7fb 100644
--- a/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx
+++ b/src/beta/components/search/SearchResultList/SearchResultSingleItem.jsx
@@ -45,8 +45,8 @@ export const SearchResultSingleItem = ({log, selected, onClick}) => {
         />
       </Stack>
       <Stack flexDirection="row" gap={0.5} flexWrap="wrap" gridColumn="span 2">
-        {log?.logbooks?.map(it => <LogbookChip key={it.name} name={it.name} />)}
-        {log?.tags?.map(it => <TagChip key={it.name} name={it.name} />)}
+        {log?.logbooks?.map(it => <LogbookChip key={it.name} value={it.name} />)}
+        {log?.tags?.map(it => <TagChip key={it.name} value={it.name} />)}
       </Stack>
     </Stack>
   );
diff --git a/src/beta/components/search/SearchResults.js b/src/beta/components/search/SearchResults.js
index 0421cd6..78dd5d9 100644
--- a/src/beta/components/search/SearchResults.js
+++ b/src/beta/components/search/SearchResults.js
@@ -1,22 +1,27 @@
-import { Alert, Box, Divider, IconButton, LinearProgress, Stack, TablePagination, Typography, styled } from "@mui/material";
+import { Alert, Badge, Box, Divider, IconButton, LinearProgress, Stack, TablePagination, Typography, styled } from "@mui/material";
 import { ologApi, removeEmptyKeys } from "api/ologApi";
 import customization from "config/customization";
 import { updateCurrentLogEntry, useCurrentLogEntry } from "features/currentLogEntryReducer";
 import { updateSearchPageParams, useSearchPageParams } from "features/searchPageParamsReducer";
-import { useSearchParams } from "features/searchParamsReducer";
-import React, { useEffect, useState } from "react";
+import { updateSearchParams, useSearchParams } from "features/searchParamsReducer";
+import React, { useEffect, useMemo, useState } from "react";
 import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import SearchResultList from "./SearchResultList";
 import SimpleSearch from "./SimpleSearch";
 import { SortToggleButton } from "./SortToggleButton";
 import FilterAltIcon from '@mui/icons-material/FilterAlt';
+import { SearchParamsBadges } from "./SearchParamsBadges";
+import { AdvancedSearchDrawer } from "./SearchResultList/AdvancedSearchDrawer";
+import { useAdvancedSearch } from "features/advancedSearchReducer";
+import { withCacheBust } from "hooks/useSanitizedSearchParams";
 
 export const SearchResults = styled(({className}) => {
 
   const dispatch = useDispatch();
   const navigate = useNavigate();
 
+  const { active: advancedSearchActive, fieldCount: advancedSearchFieldCount } = useAdvancedSearch();
   const currentLogEntry = useCurrentLogEntry();
   const searchParams = useSearchParams();
   const searchPageParams = useSearchPageParams();
@@ -28,6 +33,40 @@ export const SearchResults = styled(({className}) => {
       ? searchPageParams?.size 
       : customization.defaultPageSize
   );
+  const [advancedSearchOpen, setAdvancedSearchOpen] = useState(false);
+
+  const searchLogsQuery = useMemo(() => {
+    
+    let params = {
+      ...searchPageParams,
+      sort: searchPageParams.dateDescending ? "down" : "up"
+    };
+
+    if (advancedSearchActive) {
+      params = { 
+        ...params,
+        ...searchParams
+      };
+      if(params.tags) {
+        params.tags = params.tags.map(it => it.name);
+      }
+      if(params.logbooks) {
+          params.logbooks = params.logbooks.map(it => it.name);
+      }
+      if(params.query) {
+        delete params.query;
+      }
+    } else {
+      params = {
+        ...params,
+        query: searchParams.query,
+        start: searchParams.start
+      };
+    }
+
+    return withCacheBust(removeEmptyKeys(params));
+
+  }, [searchPageParams, searchParams, advancedSearchActive]);
 
   const {         
       data: searchResults={
@@ -37,13 +76,7 @@ export const SearchResults = styled(({className}) => {
       error, 
       isFetching: loading 
   } = ologApi.endpoints.searchLogs.useQuery(
-    {
-      searchParams: {...removeEmptyKeys({...searchParams})}, 
-      searchPageParams: { 
-          ...searchPageParams, 
-          sort: searchPageParams.dateDescending ? "down" : "up"
-      }
-    }, 
+    searchLogsQuery, 
     {
       pollingInterval: customization.defaultSearchFrequency,
       refetchOnMountOrArgChange: true,
@@ -89,19 +122,23 @@ export const SearchResults = styled(({className}) => {
       divider={<Divider />}
       position="relative"
     >
+      <AdvancedSearchDrawer searchParams={searchParams} advancedSearchOpen={advancedSearchOpen} setAdvancedSearchOpen={setAdvancedSearchOpen} />
       <Box>
-        <SimpleSearch />
+        { advancedSearchActive ? null : <SimpleSearch /> }
+        <SearchParamsBadges search={searchParams} onSearch={vals => dispatch(updateSearchParams(vals))} />
         <Stack flexDirection="row" justifyContent="space-between" alignItems="center">
           <Stack flexDirection="row" alignItems="center" gap={0.5}>
-            <Typography component="h2" variant="h6" fontWeight="bold" >Search Results</Typography>
+            <Typography component="h2" variant="h6" fontWeight="bold" >Results</Typography>
             {searchResults.hitCount > 0 ? 
               <Typography variant="body2" fontStyle="italic" height="100%" position="relative" top={2}>{searchPageParams.from + 1}-{remaining} of {count}</Typography>
               : null
             }
           </Stack>
           <Stack flexDirection="row" alignItems="center">
-            <IconButton>
-              <FilterAltIcon />
+            <IconButton onClick={() => setAdvancedSearchOpen(true)}>
+              <Badge badgeContent={advancedSearchActive ? advancedSearchFieldCount : 0} color="primary">
+                <FilterAltIcon />
+              </Badge>
             </IconButton>
             <SortToggleButton label="create date" isDescending={searchPageParams?.dateDescending} onClick={toggleSort} />
           </Stack>
@@ -126,7 +163,7 @@ export const SearchResults = styled(({className}) => {
             onRowClick={onRowClick}
           /> 
         : <Box >
-            <Typography>No Results</Typography>
+            <Typography>No records found</Typography>
           </Box>
       }
       <TablePagination
diff --git a/src/beta/components/search/SimpleSearch/SimpleSearch.js b/src/beta/components/search/SimpleSearch.js
similarity index 54%
rename from src/beta/components/search/SimpleSearch/SimpleSearch.js
rename to src/beta/components/search/SimpleSearch.js
index 8edf1f5..95c61f2 100644
--- a/src/beta/components/search/SimpleSearch/SimpleSearch.js
+++ b/src/beta/components/search/SimpleSearch.js
@@ -1,48 +1,42 @@
-import { Chip, InputAdornment, Stack } from "@mui/material";
+import { InputAdornment, Stack } from "@mui/material";
 import TextInput from "components/shared/input/TextInput";
 import { ButtonDatePicker, DATE_FORMAT } from "components/shared/input/WizardDateInput";
-import { forceUpdateSearchParams, useSearchParams } from "features/searchParamsReducer";
+import { useAdvancedSearch } from "features/advancedSearchReducer";
+import { defaultSearchParams, updateSearchParams, useSearchParams } from "features/searchParamsReducer";
 import React from "react";
 import { useForm } from "react-hook-form";
 import { useDispatch } from "react-redux";
 
 const SimpleSearch = () => {
 
-  const searchParams = useSearchParams();
   const dispatch = useDispatch();
+  const searchParams = useSearchParams();
+  const { active: advancedSearchActive } = useAdvancedSearch();
 
-  const { control, handleSubmit, setValue, watch, getValues } = useForm({
-    defaultValues: { query: searchParams?.query, start: searchParams?.start },
+  const { control, handleSubmit, setValue, getValues } = useForm({
+    defaultValues: { query: defaultSearchParams.query, start: defaultSearchParams.start },
     values: { query: searchParams?.query, start: searchParams?.start }
   });
 
-  const startDateValue = watch("start");
-
   const onAccept = (momentDate) => {
-    console.log({onAccept: momentDate})
     setValue("start", momentDate.format(DATE_FORMAT));
     onSubmit(getValues());
   }
-  const onReject = () => {
-    setValue("start", null);
-    onSubmit(getValues());
-  }
 
   const onSubmit = (data) => {
-    console.log({onSubmit: data, searchParams})
     const params = {
       ...searchParams,
       ...data
     }
-    dispatch(forceUpdateSearchParams(params));
+    dispatch(updateSearchParams(params));
   }
 
   return (
-    <Stack 
-      component="form" 
-      gap={1}
-      width="100%" 
-      onSubmit={handleSubmit(onSubmit)}
+    <Stack
+        component="form" 
+        gap={1}
+        width="100%" 
+        onSubmit={handleSubmit(onSubmit)}
     >
       <TextInput 
         control={control}
@@ -51,28 +45,23 @@ const SimpleSearch = () => {
         defaultValue=""
         fullWidth
         InputProps={{
-          endAdornment: (
+          disabled: advancedSearchActive,
+          endAdornment:
             <InputAdornment position="end">
               <ButtonDatePicker 
                 onAccept={onAccept} 
                 ButtonFieldProps={{
                   inputProps: {
-                    "aria-label": `Select start date/time`
+                    "aria-label": `Select start date/time}`
                   }
                 }}
+                disabled={advancedSearchActive}
               />
             </InputAdornment>
-          )
         }}
       />
-      <Stack flexDirection="row" justifyContent="flex-end">
-        {
-          startDateValue ? <Chip label={`from: ${startDateValue}`} size="small" onDelete={onReject} /> : null 
-        }
-      </Stack>
     </Stack>
   )
-
 };
 
 export default SimpleSearch;
\ No newline at end of file
diff --git a/src/beta/components/search/SimpleSearch/index.js b/src/beta/components/search/SimpleSearch/index.js
deleted file mode 100644
index 4f3c77f..0000000
--- a/src/beta/components/search/SimpleSearch/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import SimpleSearch from "./SimpleSearch";
-
-export { SimpleSearch };
-export default SimpleSearch;
\ No newline at end of file
diff --git a/src/components/Filters/Filters.js b/src/components/Filters/Filters.js
index 6ee59e3..8664c2c 100644
--- a/src/components/Filters/Filters.js
+++ b/src/components/Filters/Filters.js
@@ -17,7 +17,7 @@
  */
 import { useForm } from 'react-hook-form';
 import { useDispatch } from 'react-redux';
-import { forceUpdateSearchParams, useSearchParams } from 'features/searchParamsReducer';
+import { updateSearchParams, useSearchParams } from 'features/searchParamsReducer';
 import { updateSearchPageParams, useSearchPageParams } from 'features/searchPageParamsReducer';
 import Collapse from './Collapse';
 import TextInput from 'components/shared/input/TextInput';
@@ -54,7 +54,7 @@ const Filters = ({showFilters, className}) => {
             const updatedSearchPageParams = {...searchPageParams, sort: data.sort}
             dispatch(updateSearchPageParams(updatedSearchPageParams));
         }
-        dispatch(forceUpdateSearchParams(updatedSearchParams));
+        dispatch(updateSearchParams(updatedSearchParams));
 
     }
 
diff --git a/src/components/LogEntriesView/LogEntriesView.js b/src/components/LogEntriesView/LogEntriesView.js
index ac0e134..8b8a600 100644
--- a/src/components/LogEntriesView/LogEntriesView.js
+++ b/src/components/LogEntriesView/LogEntriesView.js
@@ -30,6 +30,7 @@ import Filters from 'components/Filters';
 import { Typography, styled } from '@mui/material';
 import { grey } from '@mui/material/colors';
 import { useSearchParams } from 'features/searchParamsReducer';
+import { withCacheBust } from 'hooks/useSanitizedSearchParams';
 
 const ContentContainer = styled("div")( ({theme}) => ({
     height: "100%",
@@ -94,19 +95,23 @@ const LogEntriesView = () => {
     const searchParams = useSearchParams();
     const searchPageParams = useSearchPageParams();
     const searchLogsQuery = useMemo(() => {
-        
-        const sanitizedSearchParams = {...searchParams};
-        if(searchParams.tags) {
-            sanitizedSearchParams.tags = searchParams.tags.map(it => it.name);
-        }
-        if(searchParams.logbooks) {
-            sanitizedSearchParams.logbooks = searchParams.logbooks.map(it => it.name);
-        }
-
-        return {
-            searchParams: removeEmptyKeys(sanitizedSearchParams),
-            searchPageParams
-        };
+    
+      let params = {
+        ...searchPageParams,
+        ...searchParams
+      };
+  
+      if(params.tags) {
+        params.tags = params.tags.map(it => it.name);
+      }
+      if(params.logbooks) {
+          params.logbooks = params.logbooks.map(it => it.name);
+      }
+      if(params.query) {
+        delete params.query;
+      }
+  
+      return withCacheBust(removeEmptyKeys(params));
 
     }, [searchParams, searchPageParams]);
 
diff --git a/src/components/log/EntryEditor/Description/Description.js b/src/components/log/EntryEditor/Description/Description.js
index 1787f93..f5c67a6 100644
--- a/src/components/log/EntryEditor/Description/Description.js
+++ b/src/components/log/EntryEditor/Description/Description.js
@@ -155,17 +155,17 @@ const Description = ({form, attachmentsDisabled }) => {
             />
             <Stack direction="row" justifyContent="space-between">
                 <Box>
-                    <ExternalLink href={`${customization.APP_BASE_URL}/help/CommonmarkCheatsheet`} 
-                        text={
-                            <Stack flexDirection="row" gap={0.5} alignItems="center">
-                                <FaMarkdown />
-                                <Typography component="span">
-                                    CommonMark Formatting Help
-                                </Typography>
-                            </Stack>
-                        }
-                        label="CommonMark Formatting Help"
-                    />
+                    <ExternalLink 
+                      href={`${customization.APP_BASE_URL}/help/CommonmarkCheatsheet`}
+                      label="CommonMark Formatting Help"
+                    >
+                      <Stack flexDirection="row" gap={0.5} alignItems="center">
+                        <FaMarkdown />
+                        <Typography component="span">
+                          CommonMark Formatting Help
+                        </Typography>
+                      </Stack>
+                    </ExternalLink>
                 </Box>
                 <Stack direction="row" gap={1}>
                     <Button variant="outlined" disabled={attachmentsDisabled} onClick={() => setShowEmbedImageDialog(true) } >
diff --git a/src/components/shared/input/WizardDateInput.js b/src/components/shared/input/WizardDateInput.js
index 982d23c..8a49d7f 100644
--- a/src/components/shared/input/WizardDateInput.js
+++ b/src/components/shared/input/WizardDateInput.js
@@ -88,7 +88,7 @@ const ButtonField = ({
         aria-label={ariaLabel}
         onClick={() => setOpen?.((prev) => !prev)}
       >
-        <CalendarMonthIcon color="primary" />
+        <CalendarMonthIcon color={disabled ? "disabled" : "primary"} />
       </IconButton>
     );
 }
@@ -128,8 +128,10 @@ export const ButtonDatePicker = ({slots, ButtonFieldProps, ...props}) => {
         />
     );
 }
-
-const WizardDateInput = styled(({name, label, form, rules, defaultValue, onChange, className, DatePickerProps, ...props}) => {
+const defaultOnChange = (field, value) => {
+  field.onChange(value);
+}
+const WizardDateInput = styled(({name, label, form, rules, defaultValue, onChange = defaultOnChange, className, DatePickerProps, ...props}) => {
 
     const {control} = form;
     const {field: {ref, ...field}, fieldState} = useController({name, control, rules, defaultValue});
diff --git a/src/components/shared/input/managed/SearchBoxInput.js b/src/components/shared/input/managed/SearchBoxInput.js
index 8bcd0ae..4c05f28 100644
--- a/src/components/shared/input/managed/SearchBoxInput.js
+++ b/src/components/shared/input/managed/SearchBoxInput.js
@@ -19,9 +19,9 @@
 import React, { useEffect } from "react";
 
 import { useState } from 'react';
-import useSanitizedSearchParams, { withoutCacheBust } from 'hooks/useSanitizedSearchParams';
+import useSanitizedSearchParams, { withoutBetaParams, withoutCacheBust } from 'hooks/useSanitizedSearchParams';
 import { useDispatch } from "react-redux";
-import { forceUpdateSearchParams } from "features/searchParamsReducer";
+import { updateSearchParams } from "features/searchParamsReducer";
 import { InputAdornment, Link, OutlinedInput, styled } from "@mui/material";
 import HelpIcon from '@mui/icons-material/Help';
 import { removeEmptyKeys } from "api/ologApi";
@@ -45,7 +45,9 @@ const SearchBoxInput = styled(({searchParams, showFilters, className}) => {
                 toQueryString(
                     removeEmptyKeys(
                         withoutCacheBust(
+                          withoutBetaParams(
                             searchParams
+                          )
                         )
                     )
                 )
@@ -60,7 +62,7 @@ const SearchBoxInput = styled(({searchParams, showFilters, className}) => {
     const onKeyDown = (event) => {
         if(event.key === 'Enter') {
             const sanitizedSearchParams = toSearchParams(searchString);
-            dispatch(forceUpdateSearchParams(sanitizedSearchParams));
+            dispatch(updateSearchParams(sanitizedSearchParams));
         }
     }
 
diff --git a/src/features/advancedSearchReducer.js b/src/features/advancedSearchReducer.js
new file mode 100644
index 0000000..d032039
--- /dev/null
+++ b/src/features/advancedSearchReducer.js
@@ -0,0 +1,52 @@
+import { createSlice } from "@reduxjs/toolkit";
+import { useSelector } from "react-redux";
+import { searchParamsSlice } from "./searchParamsReducer";
+
+export const defaultAdvancedSearchState = {
+  active: false,
+  fieldCount: 0
+};
+
+export const advancedSearchSlice = createSlice({
+    name: 'advancedSearch',
+    initialState: defaultAdvancedSearchState,
+    extraReducers: (builder) => {
+      builder.addCase(
+        searchParamsSlice.actions.updateSearchParams,
+        (state, action) => {
+          const searchParams = action.payload;
+
+          let advancedSearchActive = false;
+          let activeFieldCount = 0;
+
+          // Increment field count if advanced-only fields have values
+          searchParams.attachments && activeFieldCount++;
+          searchParams.title && activeFieldCount++;
+          searchParams.desc && activeFieldCount++;
+          searchParams.end && activeFieldCount++;
+          searchParams.level && activeFieldCount++;
+          searchParams?.logbooks?.length > 0 && activeFieldCount++;
+          searchParams?.tags?.length > 0 && activeFieldCount++;
+          searchParams.owner && activeFieldCount++;
+
+
+          // If any of the advanced-only fields have values
+          // then advanced search is active
+          if(activeFieldCount > 0) {
+            advancedSearchActive = true;
+          }
+
+          // Add additional field count for shared simple/advanced search fields
+          searchParams.start && activeFieldCount ++
+
+          // update state
+          state.active = advancedSearchActive;
+          state.fieldCount = activeFieldCount;
+        }
+      )
+    }
+})
+
+export const useAdvancedSearch = () => useSelector(state => state.advancedSearch);
+
+export default advancedSearchSlice.reducer;
\ No newline at end of file
diff --git a/src/features/searchParamsReducer.js b/src/features/searchParamsReducer.js
index 43690fd..10e57b1 100644
--- a/src/features/searchParamsReducer.js
+++ b/src/features/searchParamsReducer.js
@@ -1,13 +1,23 @@
 import { createSlice } from "@reduxjs/toolkit";
 import Cookies from "universal-cookie";
 import customization from "config/customization";
-import { withCacheBust } from "hooks/useSanitizedSearchParams";
 import { useSelector } from "react-redux";
 
 const cookies = new Cookies();
-// const initialState = cookies.get(customization.searchParamsCookie) || {...customization.defaultSearchParams};
-// cookies.set(customization.searchParamsCookie, initialState, {path: '/', maxAge: '100000000'}); 
-export const defaultSearchParamsState = {...customization.defaultSearchParams};
+
+export const defaultSearchParams = {
+  query: "",
+  title: "",
+  desc: "",
+  owner: "",
+  level: undefined,
+  start: undefined,
+  end: undefined,
+  logbooks: [],
+  tags: [],
+  attachments: ""
+};
+export const defaultSearchParamsState = {...defaultSearchParams, ...customization.defaultSearchParams};
 
 export const searchParamsSlice = createSlice({
     name: 'searchParams',
@@ -16,19 +26,10 @@ export const searchParamsSlice = createSlice({
         updateSearchParams: (state, action) => {
             const searchParams = action.payload;
             cookies.set(customization.searchParamsCookie, searchParams, {path: '/', maxAge: '100000000'}); 
-            return searchParams;
+            return {...searchParams};
         }
     }
-})
-
-// This is a workaround to allowing users to force search
-// updates from e.g. hitting enter repeatedly on the search box.
-// Redux only fires an event if the state has changed
-// So we force a change by adding a cacheBust param (which must be
-// later removed before an API call)
-export const forceUpdateSearchParams = (searchParams) => {
-    return updateSearchParams(withCacheBust(searchParams));
-}
+});
 
 export const { updateSearchParams } = searchParamsSlice.actions;
 
diff --git a/src/features/store.js b/src/features/store.js
index b8564f7..23805d5 100644
--- a/src/features/store.js
+++ b/src/features/store.js
@@ -4,6 +4,7 @@ import searchParamsReducer from "features/searchParamsReducer";
 import { ologApi } from "api/ologApi";
 import currentLogEntryReducer from "features/currentLogEntryReducer";
 import userSliceReducer from "./authSlice";
+import advancedSearchReducer from "./advancedSearchReducer";
 
 export const setupStore = (preloadedState) => {
     return configureStore({
@@ -11,6 +12,7 @@ export const setupStore = (preloadedState) => {
             searchParams: searchParamsReducer,
             searchPageParams: searchPageParamsReducer,
             currentLogEntry: currentLogEntryReducer,
+            advancedSearch: advancedSearchReducer,
             [ologApi.reducerPath]: ologApi.reducer,
             auth: userSliceReducer
         },
diff --git a/src/hooks/useSanitizedSearchParams.js b/src/hooks/useSanitizedSearchParams.js
index 38a4fba..3ff9956 100644
--- a/src/hooks/useSanitizedSearchParams.js
+++ b/src/hooks/useSanitizedSearchParams.js
@@ -88,6 +88,14 @@ export function withoutCacheBust(searchParams) {
     return copy;
 }
 
+export function withoutBetaParams(searchParams) {
+  const copy = {...searchParams};
+  if (copy.query) {
+    delete copy.query;
+  }
+  return copy;
+}
+
 const useSanitizedSearchParams = () => {
 
     // todo: display toast on error to let user know tags or logbooks couldn't be fetched