diff --git a/hyperglass/execution/execute.py b/hyperglass/execution/execute.py
index 7abe2d0..7bb8c15 100644
--- a/hyperglass/execution/execute.py
+++ b/hyperglass/execution/execute.py
@@ -402,6 +402,6 @@ class Execute:
                 params.messages.no_output, device_name=device.display_name
             )
 
-        log.debug(f"Output for query: {self.query}:\n{output}")
+        log.debug(f"Output for query: {self.query_data}:\n{output}")
 
         return output
diff --git a/ui/components/HyperglassForm.js b/ui/components/HyperglassForm.js
index 5a93192..5281b8f 100644
--- a/ui/components/HyperglassForm.js
+++ b/ui/components/HyperglassForm.js
@@ -157,8 +157,8 @@ const HyperglassForm = React.forwardRef(
                             fieldAddOn={
                                 validFqdnQueryType && (
                                     <ResolvedTarget
-                                        formQueryTarget={queryTarget}
-                                        target={validFqdnQueryType}
+                                        queryTarget={queryTarget}
+                                        fqdnTarget={validFqdnQueryType}
                                         setTarget={handleChange}
                                     />
                                 )
@@ -173,7 +173,7 @@ const HyperglassForm = React.forwardRef(
                                 )}
                                 value={queryTarget}
                                 setFqdn={setFqdnTarget}
-                                setValue={handleChange}
+                                setTarget={handleChange}
                                 displayValue={displayTarget}
                                 setDisplayValue={setDisplayTarget}
                             />
diff --git a/ui/components/QueryTarget.js b/ui/components/QueryTarget.js
index 01e9b63..0ff707e 100644
--- a/ui/components/QueryTarget.js
+++ b/ui/components/QueryTarget.js
@@ -21,7 +21,7 @@ const QueryTarget = ({
     setFqdn,
     name,
     value,
-    setValue,
+    setTarget,
     resolveTarget,
     displayValue,
     setDisplayValue
@@ -37,7 +37,7 @@ const QueryTarget = ({
     };
     const handleChange = e => {
         setDisplayValue(e.target.value);
-        setValue({ field: name, value: e.target.value });
+        setTarget({ field: name, value: e.target.value });
     };
     const handleKeyDown = e => {
         if ([9, 13].includes(e.keyCode)) {
diff --git a/ui/components/ResolvedTarget.js b/ui/components/ResolvedTarget.js
index e8f980b..6812703 100644
--- a/ui/components/ResolvedTarget.js
+++ b/ui/components/ResolvedTarget.js
@@ -9,19 +9,19 @@ format.extend(String.prototype, {});
 const labelBg = { dark: "secondary", light: "secondary" };
 const labelBgSuccess = { dark: "success", light: "success" };
 
-const ResolvedTarget = React.forwardRef(({ target, setTarget, formQueryTarget }, ref) => {
+const ResolvedTarget = React.forwardRef(({ fqdnTarget, setTarget, queryTarget }, ref) => {
     const { colorMode } = useColorMode();
     const config = useConfig();
     const labelBgStatus = { true: labelBgSuccess[colorMode], false: labelBg[colorMode] };
     const params4 = {
         url: "https://cloudflare-dns.com/dns-query",
-        params: { name: target, type: "A" },
+        params: { name: fqdnTarget, type: "A" },
         headers: { accept: "application/dns-json" },
         timeout: 1000
     };
     const params6 = {
         url: "https://cloudflare-dns.com/dns-query",
-        params: { name: target, type: "AAAA" },
+        params: { name: fqdnTarget, type: "AAAA" },
         headers: { accept: "application/dns-json" },
         timeout: 1000
     };
@@ -39,20 +39,17 @@ const ResolvedTarget = React.forwardRef(({ target, setTarget, formQueryTarget },
     };
 
     const isSelected = value => {
-        console.log("value: ", value, "formQuerytarget: ", formQueryTarget, "target: ", target);
-        return labelBgStatus[value === formQueryTarget];
+        return labelBgStatus[value === queryTarget];
     };
 
     useEffect(() => {
-        if (data6 && data6.Answer && data6.Answer[0].type === 28 && data === "") {
+        if (data6 && data6.Answer && data6.Answer[0].type === 28) {
             handleOverride(data6.Answer[0].data);
-        }
-    }, [data6, data]);
-    useEffect(() => {
-        if (data4 && data4.Answer && data4.Answer[0].type === 28 && data === "") {
+        } else if (data4 && data4.Answer && data4.Answer[0].type === 1 && !data6?.Answer) {
             handleOverride(data4.Answer[0].data);
         }
-    }, [data4, data]);
+    }, [data4, data6, data]);
+
     return (
         <Stack
             ref={ref}