diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index cd1a40b5ef5d9..038a1dbcec8dc 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -81,6 +81,15 @@ function BaseListItem<TItem extends ListItem>({
                             </View>
                         </View>
                     )}
+                    {!item.isSelected && !!item.brickRoadIndicator && (
+                        <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                            <Icon
+                                src={Expensicons.DotIndicator}
+                                fill={item.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.INFO ? theme.iconSuccessFill : theme.danger}
+                            />
+                        </View>
+                    )}
+
                     {rightHandSideComponentRender()}
                 </View>
                 {FooterComponent}
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 8dd7577de7798..80d6ce122719f 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -71,6 +71,9 @@ function BaseSelectionList<TItem extends ListItem>(
         textInputRef,
         headerMessageStyle,
         shouldHideListOnInitialRender = true,
+        textInputIconLeft,
+        sectionTitleStyles,
+        textInputAutoFocus = true,
     }: BaseSelectionListProps<TItem>,
     ref: ForwardedRef<SelectionListHandle>,
 ) {
@@ -79,7 +82,7 @@ function BaseSelectionList<TItem extends ListItem>(
     const listRef = useRef<RNSectionList<TItem, SectionWithIndexOffset<TItem>>>(null);
     const innerTextInputRef = useRef<RNTextInput | null>(null);
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    const shouldShowTextInput = !!textInputLabel;
+    const shouldShowTextInput = !!textInputLabel || !!textInputIconLeft;
     const shouldShowSelectAll = !!onSelectAll;
     const activeElementRole = useActiveElementRole();
     const isFocused = useIsFocused();
@@ -310,7 +313,7 @@ function BaseSelectionList<TItem extends ListItem>(
             // We do this so that we can reference the height in `getItemLayout` –
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter]}>
+            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}>
                 <Text style={[styles.ph4, styles.textLabelSupporting]}>{section.title}</Text>
             </View>
         );
@@ -377,6 +380,9 @@ function BaseSelectionList<TItem extends ListItem>(
     /** Focuses the text input when the component comes into focus and after any navigation animations finish. */
     useFocusEffect(
         useCallback(() => {
+            if (!textInputAutoFocus) {
+                return;
+            }
             if (shouldShowTextInput) {
                 focusTimeoutRef.current = setTimeout(() => {
                     if (!innerTextInputRef.current) {
@@ -391,7 +397,7 @@ function BaseSelectionList<TItem extends ListItem>(
                 }
                 clearTimeout(focusTimeoutRef.current);
             };
-        }, [shouldShowTextInput]),
+        }, [shouldShowTextInput, textInputAutoFocus]),
     );
 
     const prevTextInputValue = usePrevious(textInputValue);
@@ -494,8 +500,12 @@ function BaseSelectionList<TItem extends ListItem>(
                                             return;
                                         }
 
-                                        // eslint-disable-next-line no-param-reassign
-                                        textInputRef.current = element as RNTextInput;
+                                        if (typeof textInputRef === 'function') {
+                                            textInputRef(element as RNTextInput);
+                                        } else {
+                                            // eslint-disable-next-line no-param-reassign
+                                            textInputRef.current = element as RNTextInput;
+                                        }
                                     }}
                                     label={textInputLabel}
                                     accessibilityLabel={textInputLabel}
@@ -508,6 +518,7 @@ function BaseSelectionList<TItem extends ListItem>(
                                     inputMode={inputMode}
                                     selectTextOnFocus
                                     spellCheck={false}
+                                    iconLeft={textInputIconLeft}
                                     onSubmitEditing={selectFocusedOption}
                                     blurOnSubmit={!!flattenedSections.allOptions.length}
                                     isLoading={isLoadingNewOptions}
@@ -515,7 +526,9 @@ function BaseSelectionList<TItem extends ListItem>(
                                 />
                             </View>
                         )}
-                        {!!headerMessage && (
+                        {/* If we are loading new options we will avoid showing any header message. This is mostly because one of the header messages says there are no options. */}
+                        {/* This is misleading because we might be in the process of loading fresh options from the server. */}
+                        {!isLoadingNewOptions && !!headerMessage && (
                             <View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
                                 <Text style={[styles.textLabel, styles.colorMuted]}>{headerMessage}</Text>
                             </View>
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index e401dd5456b2f..f4b1b990811f0 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -1,10 +1,12 @@
 import type {MutableRefObject, ReactElement, ReactNode} from 'react';
 import type {GestureResponderEvent, InputModeOptions, LayoutChangeEvent, SectionListData, StyleProp, TextInput, TextStyle, ViewStyle} from 'react-native';
 import type {MaybePhraseKey} from '@libs/Localize';
+import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import type CONST from '@src/CONST';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {ReceiptErrors} from '@src/types/onyx/Transaction';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import type IconAsset from '@src/types/utils/IconAsset';
 import type InviteMemberListItem from './InviteMemberListItem';
 import type RadioListItem from './RadioListItem';
 import type TableListItem from './TableListItem';
@@ -110,6 +112,8 @@ type ListItem = {
 
     /** The search value from the selection list */
     searchText?: string | null;
+
+    brickRoadIndicator?: BrickRoad | '' | null;
 };
 
 type ListItemProps = CommonListItemProps<ListItem> & {
@@ -214,6 +218,12 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Max length for the text input */
     textInputMaxLength?: number;
 
+    /** Icon to display on the left side of TextInput */
+    textInputIconLeft?: IconAsset;
+
+    /** Whether text input should be focused */
+    textInputAutoFocus?: boolean;
+
     /** Callback to fire when the text input changes */
     onChangeText?: (text: string) => void;
 
@@ -221,7 +231,7 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     inputMode?: InputModeOptions;
 
     /** Item `keyForList` to focus initially */
-    initiallyFocusedOptionKey?: string;
+    initiallyFocusedOptionKey?: string | null;
 
     /** Callback to fire when the list is scrolled */
     onScroll?: () => void;
@@ -272,7 +282,7 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     disableKeyboardShortcuts?: boolean;
 
     /** Styles to apply to SelectionList container */
-    containerStyle?: ViewStyle;
+    containerStyle?: StyleProp<ViewStyle>;
 
     /** Whether keyboard is visible on the screen */
     isKeyboardShown?: boolean;
@@ -296,7 +306,10 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     isRowMultilineSupported?: boolean;
 
     /** Ref for textInput */
-    textInputRef?: MutableRefObject<TextInput | null>;
+    textInputRef?: MutableRefObject<TextInput | null> | ((ref: TextInput | null) => void);
+
+    /** Styles for the section title */
+    sectionTitleStyles?: StyleProp<ViewStyle>;
 
     /**
      * When true, the list won't be visible until the list layout is measured. This prevents the list from "blinking" as it's scrolled to the bottom which is recommended for large lists.
diff --git a/src/components/TagPicker/index.tsx b/src/components/TagPicker/index.tsx
index 54ad016173b75..b9d2d61efa7dd 100644
--- a/src/components/TagPicker/index.tsx
+++ b/src/components/TagPicker/index.tsx
@@ -1,10 +1,9 @@
 import React, {useMemo, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import type {EdgeInsets} from 'react-native-safe-area-context';
-import OptionsSelector from '@components/OptionsSelector';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
@@ -41,12 +40,6 @@ type TagPickerProps = TagPickerOnyxProps & {
     /** Callback to submit the selected tag */
     onSubmit: () => void;
 
-    /**
-     * Safe area insets required for reflecting the portion of the view,
-     * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
-     */
-    insets: EdgeInsets;
-
     /** Should show the selected option that is disabled? */
     shouldShowDisabledAndSelectedOption?: boolean;
 
@@ -54,9 +47,8 @@ type TagPickerProps = TagPickerOnyxProps & {
     tagListIndex: number;
 };
 
-function TagPicker({selectedTag, tagListName, policyTags, tagListIndex, policyRecentlyUsedTags, shouldShowDisabledAndSelectedOption = false, insets, onSubmit}: TagPickerProps) {
+function TagPicker({selectedTag, tagListName, policyTags, tagListIndex, policyRecentlyUsedTags, shouldShowDisabledAndSelectedOption = false, onSubmit}: TagPickerProps) {
     const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const [searchValue, setSearchValue] = useState('');
 
@@ -100,22 +92,14 @@ function TagPicker({selectedTag, tagListName, policyTags, tagListIndex, policyRe
     const selectedOptionKey = sections[0]?.data?.filter((policyTag) => policyTag.searchText === selectedTag)?.[0]?.keyForList;
 
     return (
-        <OptionsSelector
-            // @ts-expect-error TODO: Remove this once OptionsSelector (https://github.com/Expensify/App/issues/25125) is migrated to TypeScript.
-            contentContainerStyles={[{paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]}
-            optionHoveredStyle={styles.hoveredComponentBG}
-            sectionHeaderStyle={styles.mt5}
+        <SelectionList
+            ListItem={RadioListItem}
+            sectionTitleStyles={styles.mt5}
             sections={sections}
-            selectedOptions={selectedOptions}
+            textInputValue={searchValue}
             headerMessage={headerMessage}
-            textInputLabel={translate('common.search')}
-            boldStyle
-            highlightSelectedOptions
+            textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
             isRowMultilineSupported
-            shouldShowTextInput={shouldShowTextInput}
-            // Focus the first option when searching
-            focusedIndex={0}
-            // Focus the selected option on first load
             initiallyFocusedOptionKey={selectedOptionKey}
             onChangeText={setSearchValue}
             onSelectRow={onSubmit}
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index d2ed2ed7f5a69..f465187cc6a37 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -1105,7 +1105,7 @@ function getCategoryListSections(
  *
  * @param tags - an initial tag array
  */
-function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled'>>): Option[] {
+function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled'>>, selectedOptions?: SelectedTagOption[]): Option[] {
     return tags.map((tag) => {
         // This is to remove unnecessary escaping backslash in tag name sent from backend.
         const cleanedName = PolicyUtils.getCleanedTagName(tag.name);
@@ -1115,6 +1115,7 @@ function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled'>>): Optio
             searchText: tag.name,
             tooltipText: cleanedName,
             isDisabled: !tag.enabled,
+            isSelected: selectedOptions?.some((selectedTag) => selectedTag.name === tag.name),
         };
     });
 }
@@ -1146,7 +1147,7 @@ function getTagListSections(
             // "Selected" section
             title: '',
             shouldShow: false,
-            data: getTagsOptions(selectedTagOptions),
+            data: getTagsOptions(selectedTagOptions, selectedOptions),
         });
 
         return tagSections;
@@ -1159,7 +1160,7 @@ function getTagListSections(
             // "Search" section
             title: '',
             shouldShow: true,
-            data: getTagsOptions(searchTags),
+            data: getTagsOptions(searchTags, selectedOptions),
         });
 
         return tagSections;
@@ -1170,7 +1171,7 @@ function getTagListSections(
             // "All" section when items amount less than the threshold
             title: '',
             shouldShow: false,
-            data: getTagsOptions(enabledTags),
+            data: getTagsOptions(enabledTags, selectedOptions),
         });
 
         return tagSections;
@@ -1195,7 +1196,7 @@ function getTagListSections(
             // "Selected" section
             title: '',
             shouldShow: true,
-            data: getTagsOptions(selectedTagOptions),
+            data: getTagsOptions(selectedTagOptions, selectedOptions),
         });
     }
 
@@ -1206,7 +1207,7 @@ function getTagListSections(
             // "Recent" section
             title: Localize.translateLocal('common.recent'),
             shouldShow: true,
-            data: getTagsOptions(cutRecentlyUsedTags),
+            data: getTagsOptions(cutRecentlyUsedTags, selectedOptions),
         });
     }
 
@@ -1214,7 +1215,7 @@ function getTagListSections(
         // "All" section when items amount more than the threshold
         title: Localize.translateLocal('common.all'),
         shouldShow: true,
-        data: getTagsOptions(filteredTags),
+        data: getTagsOptions(filteredTags, selectedOptions),
     });
 
     return tagSections;
diff --git a/src/pages/EditRequestTagPage.js b/src/pages/EditRequestTagPage.js
index 1aead9ee1f6e4..fd9064f8b6fce 100644
--- a/src/pages/EditRequestTagPage.js
+++ b/src/pages/EditRequestTagPage.js
@@ -43,24 +43,19 @@ function EditRequestTagPage({defaultTag, policyID, tagListName, tagListIndex, on
             shouldEnableMaxHeight
             testID={EditRequestTagPage.displayName}
         >
-            {({insets}) => (
-                <>
-                    <HeaderWithBackButton
-                        title={tagListName || translate('common.tag')}
-                        onBackButtonPress={Navigation.goBack}
-                    />
-                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
-                    <TagPicker
-                        selectedTag={defaultTag}
-                        tagListName={tagListName}
-                        tagListIndex={tagListIndex}
-                        policyID={policyID}
-                        shouldShowDisabledAndSelectedOption
-                        insets={insets}
-                        onSubmit={selectTag}
-                    />
-                </>
-            )}
+            <HeaderWithBackButton
+                title={tagListName || translate('common.tag')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
+            <TagPicker
+                selectedTag={defaultTag}
+                tagListName={tagListName}
+                tagListIndex={tagListIndex}
+                policyID={policyID}
+                shouldShowDisabledAndSelectedOption
+                onSubmit={selectTag}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/WorkspaceSwitcherPage.tsx b/src/pages/WorkspaceSwitcherPage.tsx
index 6f077f7644745..631d377e34cde 100644
--- a/src/pages/WorkspaceSwitcherPage.tsx
+++ b/src/pages/WorkspaceSwitcherPage.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -7,9 +7,10 @@ import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import {MagnifyingGlass} from '@components/Icon/Expensicons';
 import OptionRow from '@components/OptionRow';
-import OptionsSelector from '@components/OptionsSelector';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import UserListItem from '@components/SelectionList/UserListItem';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
@@ -57,7 +58,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
-    const [selectedOption, setSelectedOption] = useState<SimpleWorkspaceItem>();
     const [searchTerm, setSearchTerm] = useState('');
     const {inputCallbackRef} = useAutoFocusInput();
     const {translate} = useLocalize();
@@ -105,11 +105,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
 
             const {policyID} = option;
 
-            if (policyID) {
-                setSelectedOption(option);
-            } else {
-                setSelectedOption(undefined);
-            }
             setActiveWorkspaceID(policyID);
             Navigation.goBack();
             if (policyID !== activeWorkspaceID) {
@@ -141,8 +136,9 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                 boldStyle: hasUnreadData(policy?.id),
                 keyForList: policy?.id,
                 isPolicyAdmin: PolicyUtils.isPolicyAdmin(policy),
+                isSelected: policy?.id === activeWorkspaceID,
             }));
-    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline]);
+    }, [policies, getIndicatorTypeForPolicy, hasUnreadData, isOffline, activeWorkspaceID]);
 
     const filteredAndSortedUserWorkspaces = useMemo(
         () =>
@@ -236,28 +232,20 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
                 </View>
 
                 {usersWorkspaces.length > 0 ? (
-                    <OptionsSelector
-                        // @ts-expect-error TODO: remove this comment once OptionsSelector (https://github.com/Expensify/App/issues/25125) is migrated to TS
-                        placeholder={translate('workspace.switcher.placeholder')}
-                        ref={inputCallbackRef}
+                    <SelectionList
+                        ListItem={UserListItem}
+                        textInputPlaceholder={translate('workspace.switcher.placeholder')}
+                        textInputRef={inputCallbackRef}
                         sections={[usersWorkspacesSectionData]}
-                        value={searchTerm}
-                        shouldShowTextInput={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH}
+                        textInputValue={searchTerm}
                         onChangeText={setSearchTerm}
-                        selectedOptions={selectedOption ? [selectedOption] : []}
                         onSelectRow={selectPolicy}
                         shouldPreventDefaultFocusOnSelectRow
                         headerMessage={headerMessage}
-                        highlightSelectedOptions
-                        shouldShowOptions
-                        autoFocus={false}
-                        canSelectMultipleOptions={false}
-                        shouldShowSubscript={false}
-                        showTitleTooltip={false}
-                        contentContainerStyles={[styles.pt0, styles.mt0]}
-                        textIconLeft={MagnifyingGlass}
-                        // Null is to avoid selecting unfocused option when Global selected, undefined is to focus selected workspace
-                        initiallyFocusedOptionKey={!activeWorkspaceID ? null : undefined}
+                        containerStyle={[styles.pt0, styles.mt0]}
+                        textInputIconLeft={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? MagnifyingGlass : undefined}
+                        initiallyFocusedOptionKey={activeWorkspaceID}
+                        textInputAutoFocus={false}
                     />
                 ) : (
                     <WorkspaceCardCreateAWorkspace />
@@ -269,7 +257,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
             setSearchTerm,
             searchTerm,
             selectPolicy,
-            selectedOption,
             styles,
             theme.textSupporting,
             translate,
@@ -281,14 +268,6 @@ function WorkspaceSwitcherPage({policies}: WorkspaceSwitcherPageProps) {
         ],
     );
 
-    useEffect(() => {
-        if (!activeWorkspaceID) {
-            return;
-        }
-        const optionToSet = usersWorkspaces.find((option) => option.policyID === activeWorkspaceID);
-        setSelectedOption(optionToSet);
-    }, [activeWorkspaceID, usersWorkspaces]);
-
     return (
         <ScreenWrapper testID={WorkspaceSwitcherPage.displayName}>
             <HeaderWithBackButton
diff --git a/src/pages/iou/request/step/IOURequestStepTag.js b/src/pages/iou/request/step/IOURequestStepTag.js
index ed55628ecaa9b..3693e1cf9449c 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.js
+++ b/src/pages/iou/request/step/IOURequestStepTag.js
@@ -142,19 +142,14 @@ function IOURequestStepTag({
             testID={IOURequestStepTag.displayName}
             shouldShowNotFoundPage={shouldShowNotFoundPage}
         >
-            {({insets}) => (
-                <>
-                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
-                    <TagPicker
-                        policyID={report.policyID}
-                        tagListName={policyTagListName}
-                        tagListIndex={tagListIndex}
-                        selectedTag={tag}
-                        insets={insets}
-                        onSubmit={updateTag}
-                    />
-                </>
-            )}
+            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
+            <TagPicker
+                policyID={report.policyID}
+                tagListName={policyTagListName}
+                tagListIndex={tagListIndex}
+                selectedTag={tag}
+                onSubmit={updateTag}
+            />
         </StepScreenWrapper>
     );
 }
diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index 9fd7b8449afd2..baefd1bd6d669 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -1243,6 +1243,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Accounting',
                         tooltipText: 'Accounting',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'HR',
@@ -1250,6 +1251,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'HR',
                         tooltipText: 'HR',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Medical',
@@ -1257,6 +1259,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Medical',
                         tooltipText: 'Medical',
                         isDisabled: false,
+                        isSelected: false,
                     },
                 ],
             },
@@ -1272,6 +1275,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Accounting',
                         tooltipText: 'Accounting',
                         isDisabled: false,
+                        isSelected: false,
                     },
                 ],
             },
@@ -1351,6 +1355,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Medical',
                         tooltipText: 'Medical',
                         isDisabled: false,
+                        isSelected: true,
                     },
                 ],
             },
@@ -1364,6 +1369,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'HR',
                         tooltipText: 'HR',
                         isDisabled: false,
+                        isSelected: false,
                     },
                 ],
             },
@@ -1378,6 +1384,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Accounting',
                         tooltipText: 'Accounting',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Benefits',
@@ -1385,6 +1392,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Benefits',
                         tooltipText: 'Benefits',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Cleaning',
@@ -1392,6 +1400,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Cleaning',
                         tooltipText: 'Cleaning',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Food',
@@ -1399,6 +1408,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Food',
                         tooltipText: 'Food',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'HR',
@@ -1406,6 +1416,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'HR',
                         tooltipText: 'HR',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Software',
@@ -1413,6 +1424,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Software',
                         tooltipText: 'Software',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Taxes',
@@ -1420,6 +1432,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Taxes',
                         tooltipText: 'Taxes',
                         isDisabled: false,
+                        isSelected: false,
                     },
                 ],
             },
@@ -1435,6 +1448,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Accounting',
                         tooltipText: 'Accounting',
                         isDisabled: false,
+                        isSelected: false,
                     },
                     {
                         text: 'Cleaning',
@@ -1442,6 +1456,7 @@ describe('OptionsListUtils', () => {
                         searchText: 'Cleaning',
                         tooltipText: 'Cleaning',
                         isDisabled: false,
+                        isSelected: false,
                     },
                 ],
             },