diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index f97c91fc29..c7b1c840ac 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -256,15 +256,17 @@
     "analysis": "Analysis",
     "answer": "Answer",
     "application": "Application",
+    "application_plural": "Applications",
     "applicationReview": "Application review",
     "application(s)": "Application(s)",
+    "applications": "Applications",
     "applicationImports": "Application imports",
     "applicationName": "Application name",
     "archetypeName": "Archetype name",
     "applicationInformation": "Application information",
-    "applications": "Applications",
     "archetype": "Archetype",
     "archetypes": "Archetypes",
+    "archetypes_plural": "Archetypes",
     "artifact": "Artifact",
     "artifactAssociated": "Associated artifact",
     "artifactNotAssociated": "No associated artifact",
@@ -486,6 +488,12 @@
     "required": "This field is required."
   },
   "wizard": {
+    "alert": {
+      "sourceMode": {
+        "title": "Source Code Mode",
+        "description": "This mode focuses on analyzing the source code. Language-specific dependency configurations, like in Java's POM files, are not the primary focus and may not be fully analyzed."
+      }
+    },
     "composed": {
       "enable": "Enable {{what}}",
       "excluded": "Excluded {{what}}",
diff --git a/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx b/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
index 627faa55fc..f88511099e 100644
--- a/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
@@ -1,19 +1,27 @@
 import * as React from "react";
-import { ToolbarChip, ToolbarFilter, Tooltip } from "@patternfly/react-core";
 import {
+  Badge,
+  Button,
+  MenuToggle,
+  MenuToggleElement,
   Select,
-  SelectOption,
-  SelectOptionObject,
-  SelectVariant,
-  SelectProps,
   SelectGroup,
-} from "@patternfly/react-core/deprecated";
+  SelectList,
+  SelectOption,
+  TextInputGroup,
+  TextInputGroupMain,
+  TextInputGroupUtilities,
+  ToolbarChip,
+  ToolbarFilter,
+  Tooltip,
+} from "@patternfly/react-core";
 import { IFilterControlProps } from "./FilterControl";
 import {
   IMultiselectFilterCategory,
   FilterSelectOptionProps,
 } from "./FilterToolbar";
 import { css } from "@patternfly/react-styles";
+import { TimesIcon } from "@patternfly/react-icons";
 
 import "./select-overrides.css";
 
@@ -37,58 +45,54 @@ export const MultiselectFilterControl = <TItem,>({
 >): JSX.Element | null => {
   const [isFilterDropdownOpen, setIsFilterDropdownOpen] = React.useState(false);
 
-  const { selectOptions } = category;
+  const [selectOptions, setSelectOptions] = React.useState<
+    FilterSelectOptionProps[]
+  >(Array.isArray(category.selectOptions) ? category.selectOptions : []);
+
   const hasGroupings = !Array.isArray(selectOptions);
-  const flatOptions = !hasGroupings
-    ? selectOptions
-    : Object.values(selectOptions).flatMap((i) => i);
 
-  const getOptionKeyFromOptionValue = (
-    optionValue: string | SelectOptionObject
-  ) => flatOptions.find(({ value }) => value === optionValue)?.key;
+  const flatOptions: FilterSelectOptionProps[] = !hasGroupings
+    ? selectOptions
+    : (Object.values(selectOptions).flatMap(
+        (i) => i
+      ) as FilterSelectOptionProps[]);
 
-  const getOptionKeyFromChip = (chip: string) =>
-    flatOptions.find(({ value }) => value.toString() === chip)?.key;
+  const getOptionKeyFromOptionValue = (optionValue: string) =>
+    flatOptions.find(({ value }) => value === optionValue)?.key;
 
   const getOptionValueFromOptionKey = (optionKey: string) =>
     flatOptions.find(({ key }) => key === optionKey)?.value;
 
-  const onFilterSelect = (value: string | SelectOptionObject) => {
-    const optionKey = getOptionKeyFromOptionValue(value);
-    if (optionKey && filterValue?.includes(optionKey)) {
-      const updatedValues = filterValue.filter(
-        (item: string) => item !== optionKey
-      );
-      setFilterValue(updatedValues);
-    } else {
-      if (filterValue) {
-        const updatedValues = [...filterValue, optionKey];
-        setFilterValue(updatedValues as string[]);
-      } else {
-        setFilterValue([optionKey || ""]);
-      }
-    }
+  const getOptionKeyFromChip = (chipDisplayValue: string) => {
+    return flatOptions.find(({ value }) => value === chipDisplayValue)?.key;
   };
 
+  const [focusedItemIndex, setFocusedItemIndex] = React.useState<number | null>(
+    null
+  );
+
+  const [activeItem, setActiveItem] = React.useState<string | null>(null);
+  const textInputRef = React.useRef<HTMLInputElement>();
+  const [inputValue, setInputValue] = React.useState<string>("");
+
   const onFilterClear = (chip: string | ToolbarChip) => {
-    const chipKey = typeof chip === "string" ? chip : chip.key;
-    const optionKey = getOptionKeyFromChip(chipKey);
-    const newValue = filterValue
-      ? filterValue.filter((val) => val !== optionKey)
-      : [];
-    setFilterValue(newValue.length > 0 ? newValue : null);
-  };
+    const displayValue = typeof chip === "string" ? chip : chip.key;
+    const optionKey = getOptionKeyFromChip(displayValue);
 
-  // Select expects "selections" to be an array of the "value" props from the relevant optionProps
-  const selections = filterValue?.map(getOptionValueFromOptionKey) ?? [];
+    if (optionKey) {
+      const newValue = filterValue?.filter((val) => val !== optionKey) ?? [];
+      setFilterValue(newValue.length > 0 ? newValue : null);
+    }
+  };
 
   /*
    * Note: Chips can be a `ToolbarChip` or a plain `string`.  Use a hack to split a
    *       selected option in 2 parts.  Assuming the option is in the format "Group / Item"
    *       break the text and show a chip with the Item and the Group as a tooltip.
    */
-  const chips = selections.map((s, index) => {
-    const chip: string = s?.toString() ?? "";
+  const chips = filterValue?.map((s, index) => {
+    const displayValue = getOptionValueFromOptionKey(s);
+    const chip: string = displayValue?.toString() ?? "";
     const idx = chip.indexOf(CHIP_BREAK_DELINEATOR);
 
     if (idx > 0) {
@@ -110,43 +114,238 @@ export const MultiselectFilterControl = <TItem,>({
     filter: (option: FilterSelectOptionProps, groupName?: string) => boolean
   ) =>
     hasGroupings
-      ? Object.entries(selectOptions)
+      ? Object.entries(
+          selectOptions as Record<string, FilterSelectOptionProps[]>
+        )
           .sort(([groupA], [groupB]) => groupA.localeCompare(groupB))
           .map(([group, options], index) => {
             const groupFiltered =
               options?.filter((o) => filter(o, group)) ?? [];
-            return groupFiltered.length == 0 ? undefined : (
+            return groupFiltered.length === 0 ? undefined : (
               <SelectGroup key={`group-${index}`} label={group}>
-                {groupFiltered.map((optionProps) => (
-                  <SelectOption {...optionProps} key={optionProps.key} />
-                ))}
+                {groupFiltered.map((optionProps) => {
+                  const optionKey = getOptionKeyFromOptionValue(
+                    optionProps.value
+                  );
+                  if (!optionKey) return null;
+                  return (
+                    <SelectOption
+                      {...optionProps}
+                      key={optionProps.key}
+                      isSelected={filterValue?.includes(optionKey)}
+                    />
+                  );
+                })}
               </SelectGroup>
             );
           })
           .filter(Boolean)
       : flatOptions
           .filter((o) => filter(o))
-          .map((optionProps) => (
-            <SelectOption {...optionProps} key={optionProps.key} />
-          ));
+          .map((optionProps, index) => {
+            const optionKey = getOptionKeyFromOptionValue(optionProps.value);
+            if (!optionKey) return null;
+            return (
+              <SelectOption
+                {...optionProps}
+                {...(!optionProps.isDisabled && { hasCheckbox: true })}
+                key={optionProps.value || optionProps.children}
+                value={optionProps.value}
+                isFocused={focusedItemIndex === index}
+                isSelected={filterValue?.includes(optionKey)}
+              >
+                {optionProps.value}
+              </SelectOption>
+            );
+          });
 
-  /**
-   * Render options (with categories if available) where the option value OR key includes
-   * the filterInput.
-   */
-  const onOptionsFilter: SelectProps["onFilter"] = (_event, textInput) => {
-    const input = textInput?.toLowerCase();
-
-    return renderSelectOptions((optionProps, groupName) => {
-      // TODO: Checking for a filter match against the key or the value may not be desirable.
-      return (
-        groupName?.toLowerCase().includes(input) ||
-        optionProps?.key?.toLowerCase().includes(input) ||
-        optionProps?.value?.toString().toLowerCase().includes(input)
+  const onSelect = (value: string | undefined) => {
+    if (value && value !== "No results") {
+      const optionKey = getOptionKeyFromOptionValue(value);
+
+      if (optionKey) {
+        let newFilterValue: string[];
+
+        if (filterValue && filterValue.includes(optionKey)) {
+          newFilterValue = filterValue.filter((item) => item !== optionKey);
+        } else {
+          newFilterValue = filterValue
+            ? [...filterValue, optionKey]
+            : [optionKey];
+        }
+
+        setFilterValue(newFilterValue);
+      }
+    }
+    textInputRef.current?.focus();
+  };
+
+  const handleMenuArrowKeys = (key: string) => {
+    let indexToFocus = 0;
+
+    if (isFilterDropdownOpen) {
+      if (key === "ArrowUp") {
+        if (focusedItemIndex === null || focusedItemIndex === 0) {
+          indexToFocus = selectOptions.length - 1;
+        } else {
+          indexToFocus = focusedItemIndex - 1;
+        }
+      }
+
+      if (key === "ArrowDown") {
+        if (
+          focusedItemIndex === null ||
+          focusedItemIndex === selectOptions.length - 1
+        ) {
+          indexToFocus = 0;
+        } else {
+          indexToFocus = focusedItemIndex + 1;
+        }
+      }
+
+      setFocusedItemIndex(indexToFocus);
+      const focusedItem = selectOptions.filter((option) => !option.isDisabled)[
+        indexToFocus
+      ];
+      setActiveItem(
+        `select-multi-typeahead-checkbox-${focusedItem.value.replace(" ", "-")}`
       );
-    });
+    }
   };
 
+  React.useEffect(() => {
+    let newSelectOptions = Array.isArray(category.selectOptions)
+      ? category.selectOptions
+      : [];
+
+    if (inputValue) {
+      newSelectOptions = Array.isArray(category.selectOptions)
+        ? category.selectOptions?.filter((menuItem) =>
+            String(menuItem.value)
+              .toLowerCase()
+              .includes(inputValue.trim().toLowerCase())
+          )
+        : [];
+
+      if (!newSelectOptions.length) {
+        newSelectOptions = [
+          {
+            key: "no-results",
+            isDisabled: false,
+            children: `No results found for "${inputValue}"`,
+            value: "No results",
+          },
+        ];
+      }
+
+      if (!isFilterDropdownOpen) {
+        setIsFilterDropdownOpen(true);
+      }
+    }
+
+    setSelectOptions(newSelectOptions);
+    setFocusedItemIndex(null);
+    setActiveItem(null);
+  }, [inputValue]);
+
+  const onInputKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+    const enabledMenuItems = Array.isArray(selectOptions)
+      ? selectOptions.filter((option) => !option.isDisabled)
+      : [];
+    const [firstMenuItem] = enabledMenuItems;
+    const focusedItem = focusedItemIndex
+      ? enabledMenuItems[focusedItemIndex]
+      : firstMenuItem;
+
+    const newSelectOptions = flatOptions.filter((menuItem) =>
+      menuItem.value.toLowerCase().includes(inputValue.toLowerCase())
+    );
+    const selectedItem =
+      newSelectOptions.find(
+        (option) => option.value.toLowerCase() === inputValue.toLowerCase()
+      ) || focusedItem;
+
+    switch (event.key) {
+      case "Enter":
+        if (!isFilterDropdownOpen) {
+          setIsFilterDropdownOpen((prev) => !prev);
+        } else if (selectedItem && selectedItem.value !== "No results") {
+          onSelect(selectedItem.value);
+        }
+        break;
+      case "Tab":
+      case "Escape":
+        setIsFilterDropdownOpen(false);
+        setActiveItem(null);
+        break;
+      case "ArrowUp":
+      case "ArrowDown":
+        event.preventDefault();
+        handleMenuArrowKeys(event.key);
+        break;
+      default:
+        break;
+    }
+  };
+
+  const onTextInputChange = (
+    _event: React.FormEvent<HTMLInputElement>,
+    value: string
+  ) => {
+    setInputValue(value);
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      variant="typeahead"
+      onClick={() => {
+        setIsFilterDropdownOpen(!isFilterDropdownOpen);
+      }}
+      isExpanded={isFilterDropdownOpen}
+      isDisabled={isDisabled || !category.selectOptions.length}
+      isFullWidth
+    >
+      <TextInputGroup isPlain>
+        <TextInputGroupMain
+          value={inputValue}
+          onClick={() => {
+            setIsFilterDropdownOpen(!isFilterDropdownOpen);
+          }}
+          onChange={onTextInputChange}
+          onKeyDown={onInputKeyDown}
+          id="typeahead-select-input"
+          autoComplete="off"
+          innerRef={textInputRef}
+          placeholder={category.placeholderText}
+          {...(activeItem && { "aria-activedescendant": activeItem })}
+          role="combobox"
+          isExpanded={isFilterDropdownOpen}
+          aria-controls="select-typeahead-listbox"
+        />
+
+        <TextInputGroupUtilities>
+          {!!inputValue && (
+            <Button
+              variant="plain"
+              onClick={() => {
+                setInputValue("");
+                setFilterValue(null);
+                textInputRef?.current?.focus();
+              }}
+              aria-label="Clear input value"
+            >
+              <TimesIcon aria-hidden />
+            </Button>
+          )}
+          {filterValue?.length ? (
+            <Badge isRead>{filterValue.length}</Badge>
+          ) : null}
+        </TextInputGroupUtilities>
+      </TextInputGroup>
+    </MenuToggle>
+  );
+
   return (
     <ToolbarFilter
       id={`filter-control-${category.key}`}
@@ -158,18 +357,15 @@ export const MultiselectFilterControl = <TItem,>({
       <Select
         className={css(isScrollable && "isScrollable")}
         aria-label={category.title}
-        toggleId={`${category.key}-filter-value-select`}
-        onToggle={() => setIsFilterDropdownOpen(!isFilterDropdownOpen)}
-        selections={selections || []}
-        onSelect={(_, value) => onFilterSelect(value)}
+        toggle={toggle}
+        selected={filterValue}
+        onOpenChange={(isOpen) => setIsFilterDropdownOpen(isOpen)}
+        onSelect={(_, selection) => onSelect(selection as string)}
         isOpen={isFilterDropdownOpen}
-        placeholderText={category.placeholderText}
-        isDisabled={isDisabled || category.selectOptions.length === 0}
-        variant={SelectVariant.checkbox}
-        hasInlineFilter
-        onFilter={onOptionsFilter}
       >
-        {renderSelectOptions(() => true)}
+        <SelectList id="select-multi-typeahead-checkbox-listbox">
+          {renderSelectOptions(() => true)}
+        </SelectList>
       </Select>
     </ToolbarFilter>
   );
diff --git a/client/src/app/components/FilterToolbar/SelectFilterControl.tsx b/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
index 3e0ed1abb1..55d077205b 100644
--- a/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
@@ -1,15 +1,14 @@
 import * as React from "react";
-import { ToolbarFilter } from "@patternfly/react-core";
 import {
+  MenuToggle,
+  MenuToggleElement,
   Select,
+  SelectList,
   SelectOption,
-  SelectOptionObject,
-} from "@patternfly/react-core/deprecated";
+  ToolbarFilter,
+} from "@patternfly/react-core";
 import { IFilterControlProps } from "./FilterControl";
-import {
-  ISelectFilterCategory,
-  FilterSelectOptionProps,
-} from "./FilterToolbar";
+import { ISelectFilterCategory } from "./FilterToolbar";
 import { css } from "@patternfly/react-styles";
 
 import "./select-overrides.css";
@@ -34,51 +33,52 @@ export const SelectFilterControl = <TItem, TFilterCategoryKey extends string>({
 >): JSX.Element | null => {
   const [isFilterDropdownOpen, setIsFilterDropdownOpen] = React.useState(false);
 
-  const getOptionKeyFromOptionValue = (
-    optionValue: string | SelectOptionObject
-  ) =>
-    category.selectOptions.find(
-      (optionProps) => optionProps.value === optionValue
-    )?.key;
-
-  const getChipFromOptionValue = (
-    optionValue: string | SelectOptionObject | undefined
-  ) => (optionValue ? optionValue.toString() : "");
-
-  const getOptionKeyFromChip = (chip: string) =>
-    category.selectOptions.find(
-      (optionProps) => optionProps.value.toString() === chip
-    )?.key;
+  const getOptionKeyFromOptionValue = (optionValue: string) =>
+    category.selectOptions.find(({ value }) => value === optionValue)?.key;
 
   const getOptionValueFromOptionKey = (optionKey: string) =>
-    category.selectOptions.find((optionProps) => optionProps.key === optionKey)
-      ?.value;
+    category.selectOptions.find(({ key }) => key === optionKey)?.value;
 
-  const onFilterSelect = (value: string | SelectOptionObject) => {
+  const chips = filterValue?.map((key) => {
+    const displayValue = getOptionValueFromOptionKey(key);
+    return displayValue ? displayValue : key;
+  });
+
+  const onFilterSelect = (value: string) => {
     const optionKey = getOptionKeyFromOptionValue(value);
     setFilterValue(optionKey ? [optionKey] : null);
     setIsFilterDropdownOpen(false);
   };
 
   const onFilterClear = (chip: string) => {
-    const optionKey = getOptionKeyFromChip(chip);
-    const newValue = filterValue
-      ? filterValue.filter((val) => val !== optionKey)
-      : [];
-    setFilterValue(newValue.length > 0 ? newValue : null);
+    const newValue = filterValue?.filter((val) => val !== chip);
+    setFilterValue(newValue?.length ? newValue : null);
   };
 
-  // Select expects "selections" to be an array of the "value" props from the relevant optionProps
-  const selections = filterValue
-    ? filterValue.map(getOptionValueFromOptionKey)
-    : null;
-
-  const chips = selections ? selections.map(getChipFromOptionValue) : [];
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => {
+    let displayText = "Any";
+    if (filterValue && filterValue.length > 0) {
+      const selectedKey = filterValue[0];
+      const selectedDisplayValue = getOptionValueFromOptionKey(selectedKey);
+      displayText = selectedDisplayValue ? selectedDisplayValue : selectedKey;
+    }
 
-  const renderSelectOptions = (options: FilterSelectOptionProps[]) =>
-    options.map((optionProps) => (
-      <SelectOption {...optionProps} key={optionProps.key} />
-    ));
+    return (
+      <MenuToggle
+        aria-label={"Select"}
+        id={"select-filter-value-select"}
+        isFullWidth
+        ref={toggleRef}
+        onClick={() => {
+          setIsFilterDropdownOpen(!isFilterDropdownOpen);
+        }}
+        isExpanded={isFilterDropdownOpen}
+        isDisabled={isDisabled || category.selectOptions.length === 0}
+      >
+        {displayText}
+      </MenuToggle>
+    );
+  };
 
   return (
     <ToolbarFilter
@@ -91,15 +91,31 @@ export const SelectFilterControl = <TItem, TFilterCategoryKey extends string>({
       <Select
         className={css(isScrollable && "isScrollable")}
         aria-label={category.title}
-        toggleId={`${category.key}-filter-value-select`}
-        onToggle={() => setIsFilterDropdownOpen(!isFilterDropdownOpen)}
-        selections={selections || []}
-        onSelect={(_, value) => onFilterSelect(value)}
+        toggle={toggle}
+        onOpenChange={(isOpen) => setIsFilterDropdownOpen(isOpen)}
+        selected={filterValue}
+        onSelect={(_, value) => {
+          onFilterSelect(value as string);
+          setIsFilterDropdownOpen(false);
+        }}
         isOpen={isFilterDropdownOpen}
-        placeholderText="Any"
-        isDisabled={isDisabled || category.selectOptions.length === 0}
+        placeholder="Any"
+        shouldFocusToggleOnSelect
       >
-        {renderSelectOptions(category.selectOptions)}
+        <SelectList>
+          {category.selectOptions.map((o, index) => {
+            const isSelected = filterValue?.includes(o.key);
+            return (
+              <SelectOption
+                {...o}
+                key={`${index}-${o.value}`}
+                isSelected={isSelected}
+              >
+                {o.value}
+              </SelectOption>
+            );
+          })}
+        </SelectList>
       </Select>
     </ToolbarFilter>
   );
diff --git a/client/src/app/components/Notifications.tsx b/client/src/app/components/Notifications.tsx
index 2d51d05f4e..f74aa0a59b 100644
--- a/client/src/app/components/Notifications.tsx
+++ b/client/src/app/components/Notifications.tsx
@@ -10,12 +10,12 @@ export const Notifications: React.FunctionComponent = () => {
   const appContext = React.useContext(NotificationsContext);
   return (
     <AlertGroup isToast aria-live="polite">
-      {appContext.notifications.map((notification) => {
+      {appContext.notifications.map((notification, index) => {
         return (
           <Alert
             title={notification.title}
             variant={notification.variant}
-            key={notification.title}
+            key={`${notification.title}-${index}`}
             {...(!notification.hideCloseButton && {
               actionClose: (
                 <AlertActionCloseButton
@@ -25,7 +25,6 @@ export const Notifications: React.FunctionComponent = () => {
                 />
               ),
             })}
-            timeout={notification.timeout ? notification.timeout : 4000}
           >
             {notification.message}
           </Alert>
diff --git a/client/src/app/components/NotificationsContext.tsx b/client/src/app/components/NotificationsContext.tsx
index e21a8d35c3..51e8ac0979 100644
--- a/client/src/app/components/NotificationsContext.tsx
+++ b/client/src/app/components/NotificationsContext.tsx
@@ -14,7 +14,10 @@ interface INotificationsProvider {
 }
 
 interface INotificationsContext {
-  pushNotification: (notification: INotification) => void;
+  pushNotification: (
+    notification: INotification,
+    clearNotificationDelay?: number
+  ) => void;
   dismissNotification: (key: string) => void;
   notifications: INotification[];
 }
@@ -38,11 +41,18 @@ export const NotificationsProvider: React.FunctionComponent<
     notification: INotification,
     clearNotificationDelay?: number
   ) => {
-    setNotifications([
-      ...notifications,
+    setNotifications((prevNotifications) => [
+      ...prevNotifications,
       { ...notificationDefault, ...notification },
     ]);
-    setTimeout(() => setNotifications([]), clearNotificationDelay || 10000);
+
+    setTimeout(() => {
+      setNotifications((prevNotifications) => {
+        return prevNotifications.filter(
+          (notif) => notif.title !== notification.title
+        );
+      });
+    }, clearNotificationDelay || 8000);
   };
 
   const dismissNotification = (title: string) => {
diff --git a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
index 20c837ce87..d3294d44aa 100644
--- a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
@@ -85,6 +85,15 @@ export const SetMode: React.FC<ISetMode> = ({ isSingleApp, isModeValid }) => {
           <p>{t("wizard.label.notAllAnalyzableDetails")}</p>
         </Alert>
       )}
+      {mode === "source-code" && (
+        <Alert
+          variant="info"
+          isInline
+          title={t("wizard.alert.sourceMode.title")}
+        >
+          <p>{t("wizard.alert.sourceMode.description")}</p>
+        </Alert>
+      )}
       {mode === "binary-upload" && <UploadBinary />}
     </Form>
   );
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index a968a7751b..09ae2e7d9d 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -14,6 +14,7 @@ import {
   ButtonVariant,
   DropdownItem,
   Modal,
+  Tooltip,
 } from "@patternfly/react-core";
 import { PencilAltIcon, TagIcon } from "@patternfly/react-icons";
 import {
@@ -927,13 +928,15 @@ export const ApplicationsTable: React.FC = () => {
 
                       <Td isActionCell id="pencil-action">
                         {applicationWriteAccess && (
-                          <Button
-                            variant="plain"
-                            icon={<PencilAltIcon />}
-                            onClick={() =>
-                              setSaveApplicationModalState(application)
-                            }
-                          />
+                          <Tooltip content={t("actions.edit")}>
+                            <Button
+                              variant="plain"
+                              icon={<PencilAltIcon />}
+                              onClick={() =>
+                                setSaveApplicationModalState(application)
+                              }
+                            />
+                          </Tooltip>
                         )}
                       </Td>
                       <Td isActionCell id="row-actions">
diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx
index 6219a3e0f4..7a127d3435 100644
--- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx
+++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx
@@ -190,15 +190,24 @@ export const ApplicationDetailDrawer: React.FC<
                     {t("terms.associatedArchetypes")}
                   </DescriptionListTerm>
                   <DescriptionListDescription>
-                    {application?.archetypes?.length ?? 0 > 0 ? (
-                      <ArchetypeLabels
-                        archetypeRefs={application?.archetypes}
-                      />
+                    {application?.archetypes?.length ? (
+                      <>
+                        <DescriptionListDescription>
+                          {application.archetypes.length ?? 0 > 0 ? (
+                            <ArchetypeLabels
+                              archetypeRefs={application.archetypes as Ref[]}
+                            />
+                          ) : (
+                            <EmptyTextMessage message={t("terms.none")} />
+                          )}
+                        </DescriptionListDescription>
+                      </>
                     ) : (
                       <EmptyTextMessage message={t("terms.none")} />
                     )}
                   </DescriptionListDescription>
                 </DescriptionListGroup>
+
                 <DescriptionListGroup>
                   <DescriptionListTerm>
                     {t("terms.archetypesAssessed")}
@@ -425,7 +434,7 @@ export const ApplicationDetailDrawer: React.FC<
           </Tab>
           <Tab
             eventKey={TabKey.Reviews}
-            title={<TabTitleText>{t("terms.reviews")}</TabTitleText>}
+            title={<TabTitleText>{t("terms.review")}</TabTitleText>}
           >
             <ReviewFields application={application} />
           </Tab>
diff --git a/client/src/app/pages/applications/components/application-detail-drawer/review-fields.tsx b/client/src/app/pages/applications/components/application-detail-drawer/review-fields.tsx
index 2910035619..f40fdfce1c 100644
--- a/client/src/app/pages/applications/components/application-detail-drawer/review-fields.tsx
+++ b/client/src/app/pages/applications/components/application-detail-drawer/review-fields.tsx
@@ -4,11 +4,8 @@ import {
   DescriptionListGroup,
   DescriptionListTerm,
   DescriptionListDescription,
-  Title,
-  TextContent,
 } from "@patternfly/react-core";
 import { Application, Archetype, Review } from "@app/api/models";
-import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 import { useFetchReviewById, useFetchReviews } from "@app/queries/reviews";
 import { useFetchArchetypes } from "@app/queries/archetypes";
 import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
@@ -75,11 +72,6 @@ export const ReviewFields: React.FC<{
 
   return (
     <>
-      <TextContent className={spacing.mtLg}>
-        <Title headingLevel="h3" size="md">
-          {t("terms.review")}
-        </Title>
-      </TextContent>
       <DescriptionListGroup>
         <DescriptionListTerm>{t("terms.proposedAction")}</DescriptionListTerm>
         <DescriptionListDescription cy-data="proposed-action">
diff --git a/client/src/app/pages/applications/components/application-tags/application-tags.tsx b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
index ae7595e2f2..c33f41a63d 100644
--- a/client/src/app/pages/applications/components/application-tags/application-tags.tsx
+++ b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
@@ -29,6 +29,7 @@ import {
 import { useLegacyFilterState } from "@app/hooks/useLegacyFilterState";
 import { useHistory } from "react-router-dom";
 import { ItemTagLabel } from "../../../../components/labels/item-tag-label/item-tag-label";
+import { capitalizeFirstLetter } from "@app/utils/utils";
 
 interface TagWithSource extends Tag {
   source?: string;
@@ -216,7 +217,7 @@ export const ApplicationTags: React.FC<ApplicationTagsProps> = ({
                   component="h3"
                   className={`${spacing.mtSm} ${spacing.mbSm} ${textStyles.fontSizeMd}`}
                 >
-                  {source === "" ? "Manual" : source}
+                  {source === "" ? "Manual" : capitalizeFirstLetter(source)}
                 </Text>
               </TextContent>
               {Array.from(tagCategoriesInThisSource).map((tagCategory) => {
diff --git a/client/src/app/pages/archetypes/archetypes-page.tsx b/client/src/app/pages/archetypes/archetypes-page.tsx
index b4c6941e54..0f44e8f1ca 100644
--- a/client/src/app/pages/archetypes/archetypes-page.tsx
+++ b/client/src/app/pages/archetypes/archetypes-page.tsx
@@ -38,7 +38,10 @@ import {
   TableHeaderContentWithControls,
   TableRowContentWithControls,
 } from "@app/components/TableControls";
-import { useLocalTableControls } from "@app/hooks/table-controls";
+import {
+  deserializeFilterUrlParams,
+  useLocalTableControls,
+} from "@app/hooks/table-controls";
 import {
   useDeleteArchetypeMutation,
   useFetchArchetypes,
@@ -171,6 +174,10 @@ const Archetypes: React.FC = () => {
       });
     }
   };
+  const urlParams = new URLSearchParams(window.location.search);
+  const filters = urlParams.get("filters");
+
+  const deserializedFilterValues = deserializeFilterUrlParams({ filters });
 
   const tableControls = useLocalTableControls({
     persistTo: "urlParams",
@@ -206,15 +213,47 @@ const Archetypes: React.FC = () => {
           return archetype?.name ?? "";
         },
       },
+      {
+        key: "application.name",
+        title: t("terms.applicationName"),
+        type: FilterType.multiselect,
+        logicOperator: "OR",
+        selectOptions: [
+          ...new Set(
+            archetypes.flatMap(
+              (archetype) =>
+                archetype?.applications
+                  ?.map((app) => app.name)
+                  .filter(Boolean) || []
+            )
+          ),
+        ].map((applicationName) => ({
+          key: applicationName,
+          value: applicationName,
+        })),
+        placeholderText:
+          t("actions.filterBy", {
+            what: t("terms.application").toLowerCase(),
+          }) + "...",
+        getItemValue: (archetype) => {
+          const appNames = archetype.applications
+            ?.map((app) => app.name)
+            .join("");
+          return appNames || "";
+        },
+      },
+
       // TODO: Add filter for archetype tags
     ],
 
     sortableColumns: ["name"],
+    initialFilterValues: deserializedFilterValues,
     getSortValues: (archetype) => ({
       name: archetype.name ?? "",
     }),
     initialSort: { columnKey: "name", direction: "asc" },
   });
+
   const {
     currentPageItems,
     numRenderedColumns,
@@ -285,6 +324,14 @@ const Archetypes: React.FC = () => {
     assessmentWriteAccess = checkAccess(userScopes, assessmentWriteScopes),
     reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes);
 
+  const clearFilters = () => {
+    const currentPath = history.location.pathname;
+    const newSearch = new URLSearchParams(history.location.search);
+    newSearch.delete("filters");
+    history.push(`${currentPath}`);
+    filterToolbarProps.setFilterValues({});
+  };
+
   return (
     <>
       <PageSection variant={PageSectionVariants.light}>
@@ -302,7 +349,7 @@ const Archetypes: React.FC = () => {
               backgroundColor: "var(--pf-v5-global--BackgroundColor--100)",
             }}
           >
-            <Toolbar {...toolbarProps}>
+            <Toolbar {...toolbarProps} clearAllFilters={clearFilters}>
               <ToolbarContent>
                 <FilterToolbar {...filterToolbarProps} />
                 <ToolbarGroup variant="button-group">
diff --git a/client/src/app/pages/archetypes/components/archetype-detail-drawer.tsx b/client/src/app/pages/archetypes/components/archetype-detail-drawer.tsx
index 648fdd01f3..90b85d0574 100644
--- a/client/src/app/pages/archetypes/components/archetype-detail-drawer.tsx
+++ b/client/src/app/pages/archetypes/components/archetype-detail-drawer.tsx
@@ -27,6 +27,9 @@ import { LabelsFromItems } from "@app/components/labels/labels-from-items/labels
 import { ReviewFields } from "@app/pages/applications/components/application-detail-drawer/review-fields";
 import { RiskLabel } from "@app/components/RiskLabel";
 import { LabelsFromTags } from "@app/components/labels/labels-from-tags/labels-from-tags";
+import { serializeFilterUrlParams } from "@app/hooks/table-controls";
+import { Paths } from "@app/Paths";
+import { Link } from "react-router-dom";
 
 export interface IArchetypeDetailDrawerProps {
   onCloseClick: () => void;
@@ -103,10 +106,19 @@ const ArchetypeDetailDrawer: React.FC<IArchetypeDetailDrawerProps> = ({
                   {t("terms.applications")}
                 </DescriptionListTerm>
                 <DescriptionListDescription>
-                  {archetype?.applications?.length ?? 0 > 0 ? (
-                    <ApplicationLabels
-                      applicationRefs={archetype?.applications}
-                    />
+                  {archetype?.applications?.length ? (
+                    <>
+                      <Link to={getApplicationsUrl(archetype?.name)}>
+                        {archetype.applications.length}{" "}
+                        {t("terms.application", {
+                          count: archetype.applications.length,
+                          context:
+                            archetype.applications.length > 1
+                              ? "plural"
+                              : "singular",
+                        }).toLocaleLowerCase()}{" "}
+                      </Link>
+                    </>
                   ) : (
                     <EmptyTextMessage message={t("terms.none")} />
                   )}
@@ -223,10 +235,6 @@ const ArchetypeDetailDrawer: React.FC<IArchetypeDetailDrawerProps> = ({
   );
 };
 
-const ApplicationLabels: React.FC<{ applicationRefs?: Ref[] }> = ({
-  applicationRefs,
-}) => <LabelsFromItems items={applicationRefs as Ref[]} />;
-
 const TagLabels: React.FC<{ tags?: Tag[] }> = ({ tags }) => (
   <LabelsFromTags tags={tags} />
 );
@@ -240,3 +248,16 @@ const StakeholderGroupsLabels: React.FC<{ archetype: Archetype }> = ({
 }) => <LabelsFromItems items={archetype.stakeholderGroups as Ref[]} />;
 
 export default ArchetypeDetailDrawer;
+
+const getApplicationsUrl = (archetypeName: string) => {
+  const filterValues = {
+    archetypes: [archetypeName],
+  };
+
+  const serializedParams = serializeFilterUrlParams(filterValues);
+
+  const queryString = serializedParams.filters
+    ? `filters=${serializedParams.filters}`
+    : "";
+  return `${Paths.applications}?${queryString}`;
+};
diff --git a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
index 7aeae65abf..e40eac74e3 100644
--- a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
+++ b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
@@ -58,11 +58,14 @@ export const WaveStakeholdersTable: React.FC<IWaveStakeholdersTableProps> = ({
       <Toolbar {...toolbarProps}>
         <ToolbarContent>
           <ToolbarItem {...paginationToolbarItemProps}>
-            <SimplePagination
-              idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
-              isTop
-              paginationProps={paginationProps}
-            />
+            {migrationWave.allStakeholders.length > 9 && (
+              <SimplePagination
+                idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+                isTop
+                paginationProps={paginationProps}
+                isCompact
+              />
+            )}
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
@@ -116,6 +119,14 @@ export const WaveStakeholdersTable: React.FC<IWaveStakeholdersTableProps> = ({
           </Tbody>
         </ConditionalTableBody>
       </Table>
+      {migrationWave.allStakeholders.length > 9 && (
+        <SimplePagination
+          idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+          isTop={false}
+          paginationProps={paginationProps}
+          isCompact
+        />
+      )}
     </>
   );
 };
diff --git a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
index 94b645a1f1..f56baa1a09 100644
--- a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
+++ b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
@@ -73,11 +73,14 @@ export const WaveApplicationsTable: React.FC<IWaveApplicationsTableProps> = ({
       <Toolbar {...toolbarProps}>
         <ToolbarContent>
           <ToolbarItem {...paginationToolbarItemProps}>
-            <SimplePagination
-              idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
-              isTop
-              paginationProps={paginationProps}
-            />
+            {migrationWave.fullApplications.length > 9 && (
+              <SimplePagination
+                idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+                isTop
+                paginationProps={paginationProps}
+                isCompact
+              />
+            )}
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
@@ -155,6 +158,14 @@ export const WaveApplicationsTable: React.FC<IWaveApplicationsTableProps> = ({
           </Tbody>
         </ConditionalTableBody>
       </Table>
+      {migrationWave.fullApplications.length > 9 && (
+        <SimplePagination
+          idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+          isTop={false}
+          paginationProps={paginationProps}
+          isCompact
+        />
+      )}
     </>
   );
 };
diff --git a/client/src/app/pages/migration-waves/migration-waves.tsx b/client/src/app/pages/migration-waves/migration-waves.tsx
index 19117b6f38..5dc78ca762 100644
--- a/client/src/app/pages/migration-waves/migration-waves.tsx
+++ b/client/src/app/pages/migration-waves/migration-waves.tsx
@@ -42,7 +42,7 @@ import {
   useFetchMigrationWaves,
   useUpdateMigrationWaveMutation,
 } from "@app/queries/migration-waves";
-import { MigrationWave, Ref } from "@app/api/models";
+import { MigrationWave, Ref, Ticket } from "@app/api/models";
 import { FilterToolbar, FilterType } from "@app/components/FilterToolbar";
 import { useLocalTableControls } from "@app/hooks/table-controls";
 import { SimplePagination } from "@app/components/SimplePagination";
@@ -68,6 +68,7 @@ import { AppPlaceholder } from "@app/components/AppPlaceholder";
 import { ToolbarBulkSelector } from "@app/components/ToolbarBulkSelector";
 import { ConfirmDialog } from "@app/components/ConfirmDialog";
 import { toRefs } from "@app/utils/model-utils";
+import { useFetchTickets } from "@app/queries/tickets";
 
 export const MigrationWaves: React.FC = () => {
   const { t } = useTranslation();
@@ -76,6 +77,7 @@ export const MigrationWaves: React.FC = () => {
   const currentTimezone = dayjs.tz.guess();
 
   const { migrationWaves, isFetching, fetchError } = useFetchMigrationWaves();
+  const { tickets } = useFetchTickets();
   const { trackers: trackers } = useFetchTrackers();
   const { data: applications } = useFetchApplications();
 
@@ -495,16 +497,24 @@ export const MigrationWaves: React.FC = () => {
                             <ConditionalTooltip
                               key="export-to-issue-manager"
                               isTooltipEnabled={
-                                migrationWave.applications?.length < 1
+                                migrationWave.applications?.length < 1 ||
+                                !hasExportableApplications(
+                                  tickets,
+                                  migrationWave?.applications
+                                )
                               }
                               content={
-                                "There are no applications assigned to this migration wave to export."
+                                "No applications are available for export."
                               }
                             >
                               <DropdownItem
                                 key="export-to-issue-manager"
-                                isDisabled={
-                                  migrationWave.applications?.length < 1
+                                isAriaDisabled={
+                                  migrationWave.applications?.length < 1 ||
+                                  !hasExportableApplications(
+                                    tickets,
+                                    migrationWave?.applications
+                                  )
                                 }
                                 onClick={() =>
                                   setApplicationsToExport(
@@ -666,3 +676,11 @@ export const MigrationWaves: React.FC = () => {
     </>
   );
 };
+
+const hasExportableApplications = (tickets: Ticket[], applicationRefs: Ref[]) =>
+  applicationRefs.some(
+    (applicationRef) =>
+      !tickets
+        ?.map((ticket) => ticket?.application?.id)
+        .includes(applicationRef.id)
+  );
diff --git a/client/src/app/queries/questionnaires.ts b/client/src/app/queries/questionnaires.ts
index 668e5c12aa..c7cf8972bb 100644
--- a/client/src/app/queries/questionnaires.ts
+++ b/client/src/app/queries/questionnaires.ts
@@ -162,6 +162,7 @@ export const downloadQuestionnaire = async (
     delete yamlData.createTime;
     delete yamlData.id;
     delete yamlData.required;
+    delete yamlData.builtin;
 
     const newYamlData = yaml.dump(yamlData);
 
diff --git a/client/src/app/utils/utils.ts b/client/src/app/utils/utils.ts
index 7e7a9a0e35..607dc0d1c3 100644
--- a/client/src/app/utils/utils.ts
+++ b/client/src/app/utils/utils.ts
@@ -189,3 +189,6 @@ export const collapseSpacesAndCompare = (
 
   return a.localeCompare(b, locale);
 };
+
+export const capitalizeFirstLetter = (str: string) =>
+  str.charAt(0).toUpperCase() + str.slice(1);