diff --git a/src/components/form/LookupInput.tsx b/src/components/form/LookupInput.tsx
index a2096ee..d64fe65 100644
--- a/src/components/form/LookupInput.tsx
+++ b/src/components/form/LookupInput.tsx
@@ -152,7 +152,7 @@ const LookupInput: FunctionComponent<LookupInputProps> = ({
       <div className="relative">
         <Listbox.Button
           className={clsx(
-            "relative h-full w-full cursor-default rounded-r-lg bg-zinc-700 py-2 pl-3 pr-10 text-right",
+            "relative h-full w-full cursor-default rounded-r-lg bg-zinc-700 py-2 pl-3 pr-10 text-right whitespace-nowrap",
             "text-left text-xs focus:outline-none focus-visible:border-indigo-500 sm:text-sm md:text-base lg:text-lg",
             "focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75 focus-visible:ring-offset-2 focus-visible:ring-offset-orange-300 "
           )}
@@ -160,7 +160,8 @@ const LookupInput: FunctionComponent<LookupInputProps> = ({
           {/* Fetch special text for 'auto' mode, otherwise just use the options. */}
           <span className="block">
             {selected == "auto"
-              ? detectedType.unwrapOr("???")
+              // If the detected type was provided, then notate which in parentheses. Compact object naming might be better in the future. 
+              ? (detectedType.isJust ? `Auto (${objectNames[detectedType.value]})` : objectNames["auto"])
               : objectNames[selected]}
           </span>
           <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 7708fda..3db681f 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -7,9 +7,12 @@ import { OGP } from "react-ogp";
 import LookupInput from "@/components/form/LookupInput";
 import ErrorCard from "@/components/common/ErrorCard";
 import { Maybe } from "true-myth";
+import type { ObjectType } from "@/types";
+import { getType } from "@/rdap";
 
 const Index: NextPage = () => {
   const { error, setTarget, submit } = useLookup();
+  const [detectedType, setDetectedType] = useState<Maybe<ObjectType>>(Maybe.nothing());
   const [response, setResponse] = useState<ParsedGeneric | null>();
   const [isLoading, setLoading] = useState<boolean>(false);
 
@@ -41,9 +44,20 @@ const Index: NextPage = () => {
         <div className="dark container mx-auto w-full py-6 md:py-12 ">
           <LookupInput
             isLoading={isLoading}
-            detectedType={Maybe.nothing()}
+            detectedType={detectedType}
             onChange={({ target, targetType }) => {
               setTarget(target);
+
+              const detectResult = getType(target);
+              if (detectResult.isOk) {
+                const value = detectResult.value;
+                if (value == "ip4" || value == "ip6")
+                  setDetectedType(Maybe.just("ip"));
+                else
+                  setDetectedType(Maybe.just(value));
+              } else {
+                setDetectedType(Maybe.nothing());
+              }
             }}
             onSubmit={async function (props) {
               try {