diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
index d985301b6..d53a2b052 100644
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -16,6 +16,7 @@ const BillLineSearchSelect = (
       ref={ref}
       showSearch
       popupMatchSelectWidth={false}
+      optionLabelProp={"name"}
       //  optionFilterProp="line_desc"
       filterOption={(inputValue, option) => {
         return (
@@ -57,6 +58,9 @@ const BillLineSearchSelect = (
               style={{
                 ...(item.removed ? { textDecoration: "line-through" } : {}),
               }}
+              name={`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+                  item.oem_partno ? ` - ${item.oem_partno}` : ""
+              }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
             >
               <span>
                 {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
index 59a801b03..aaf0626ed 100644
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -1,89 +1,92 @@
-import { HeartOutlined } from "@ant-design/icons";
-import { Select, Space, Tag } from "antd";
-import React, { forwardRef, useEffect, useState } from "react";
+import {HeartOutlined} from "@ant-design/icons";
+import {Select, Space, Tag} from "antd";
+import React, {forwardRef, useEffect, useState} from "react";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-const { Option } = Select;
+
+const {Option} = Select;
 
 //To be used as a form element only.
 
 const VendorSearchSelect = (
-  { value, onChange, options, onSelect, disabled, preferredMake, showPhone },
-  ref
+    {value, onChange, options, onSelect, disabled, preferredMake, showPhone},
+    ref
 ) => {
-  const [option, setOption] = useState(value);
+    const [option, setOption] = useState(value);
 
-  useEffect(() => {
-    if (value !== option && onChange) {
-      onChange(option);
-    }
-  }, [value, option, onChange]);
+    useEffect(() => {
+        if (value !== option && onChange) {
+            onChange(option);
+        }
+    }, [value, option, onChange]);
 
-  const favorites =
-    preferredMake && options
-      ? options.filter(
-          (o) =>
-            o.favorite.filter(
-              (f) => f.toLowerCase() === preferredMake.toLowerCase()
-            ).length > 0
-        )
-      : [];
+    const favorites =
+        preferredMake && options
+            ? options.filter(
+                (o) =>
+                    o.favorite.filter(
+                        (f) => f.toLowerCase() === preferredMake.toLowerCase()
+                    ).length > 0
+            )
+            : [];
 
-  return (
-    <Select
-      ref={ref}
-      showSearch
-      value={option}
-      style={{
-        width: "100%",
-      }}
-      popupMatchSelectWidth={false}
-      onChange={setOption}
-      optionFilterProp="name"
-      onSelect={onSelect}
-      disabled={disabled || false}
-    >
-      {favorites
-        ? favorites.map((o) => (
-            <Option
-              key={`favorite-${o.id}`}
-              value={o.id}
-              name={o.name}
-              discount={o.discount}
-            >
-              <div className="imex-flex-row">
-                <div style={{ flex: 1 }}>{o.name}</div>
-                <Space style={{ marginLeft: "1rem" }}>
-                  <HeartOutlined style={{ color: "red" }} />
-                  {o.phone && showPhone && (
-                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
-                  )}
-                  {o.discount && o.discount !== 0 ? (
-                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                  ) : null}
-                </Space>
-              </div>
-            </Option>
-          ))
-        : null}
-      {options
-        ? options.map((o) => (
-            <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
-              <div className="imex-flex-row" style={{ width: "100%" }}>
-                <div style={{ flex: 1 }}>{o.name}</div>
+    return (
+        <Select
+            ref={ref}
+            showSearch
+            value={option}
+            style={{
+                width: "100%",
+            }}
+            popupMatchSelectWidth={false}
+            onChange={setOption}
+            optionFilterProp="name"
+            onSelect={onSelect}
+            disabled={disabled || false}
+            optionLabelProp={"name"}
+        >
+            {favorites
+                ? favorites.map((o) => (
+                    <Option
+                        key={`favorite-${o.id}`}
+                        value={o.id}
+                        name={o.name}
+                        discount={o.discount}
+                    >
+                        <div className="imex-flex-row">
+                            <div style={{flex: 1}}>{o.name}</div>
+                            <Space style={{marginLeft: "1rem"}}>
+                                <HeartOutlined style={{color: "red"}}/>
+                                {o.phone && showPhone && (
+                                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                                )}
+                                {o.discount && o.discount !== 0 ? (
+                                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                                ) : null}
+                            </Space>
+                        </div>
+                    </Option>
+                ))
+                : null}
+            {options
+                ? options.map((o) => (
+                    <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
+                        <div className="imex-flex-row" style={{width: "100%"}}>
+                            <div style={{flex: 1}}>{o.name}</div>
 
-                <Space style={{ marginLeft: "1rem" }}>
-                  {o.phone && showPhone && (
-                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
-                  )}
-                  {o.discount && o.discount !== 0 ? (
-                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                  ) : null}
-                </Space>
-              </div>
-            </Option>
-          ))
-        : null}
-    </Select>
-  );
+                            <Space style={{marginLeft: "1rem"}}>
+                                {o.phone && showPhone && (
+                                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                                )}
+                                {o.discount && o.discount !== 0 ? (
+                                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                                ) : null}
+                            </Space>
+                        </div>
+                    </Option>
+
+                ))
+                : null}
+        </Select>
+    );
 };
 export default forwardRef(VendorSearchSelect);