diff --git a/api/web/src/components/CloudTAK/CoTView.vue b/api/web/src/components/CloudTAK/CoTView.vue
index e059c70c6..17e95a758 100644
--- a/api/web/src/components/CloudTAK/CoTView.vue
+++ b/api/web/src/components/CloudTAK/CoTView.vue
@@ -348,13 +348,16 @@
                 @attachment='addAttachment($event)'
             />
 
-            <div class='col-12 py-2'>
+            <div
+                v-if='cot.properties.remarks'
+                class='col-12 py-2'
+            >
                 <label class='subheader mx-2'>Remarks</label>
                 <CopyField
+                    v-model='cot.properties.remarks'
                     :rows='10'
                     :edit='isEditable'
                     :hover='isEditable'
-                    v-model='cot.properties.remarks'
                     class='mx-1'
                 />
             </div>
@@ -594,7 +597,7 @@
                 <CopyField
                     mode='pre'
                     style='height: calc(100vh - 225px)'
-                    :modelValue='JSON.stringify(cot.as_feature(), null, 4)'
+                    :model-value='JSON.stringify(cot.as_feature(), null, 4)'
                 />
             </div>
         </template>
diff --git a/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue b/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue
index f1f2c45e3..0f4ecf4ae 100644
--- a/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue
+++ b/api/web/src/components/CloudTAK/Menu/Videos/VideoLeaseModal.vue
@@ -56,7 +56,7 @@
                         </div>
                         <CopyField
                             v-if='protocols.rtsp'
-                            :modelValue='protocols.rtsp.url.replace(/.*\//, "")'
+                            :model-value='protocols.rtsp.url.replace(/.*\//, "")'
                         />
                     </div>
                 </div>
diff --git a/api/web/src/components/CloudTAK/util/CopyField.vue b/api/web/src/components/CloudTAK/util/CopyField.vue
index d356e8f01..7f1c76ce3 100644
--- a/api/web/src/components/CloudTAK/util/CopyField.vue
+++ b/api/web/src/components/CloudTAK/util/CopyField.vue
@@ -4,13 +4,13 @@
         class='position-relative rounded-top'
     >
         <TablerInput
-            :rows='rows'
             v-model='text'
+            :rows='rows'
             :autofocus='true'
+            label=''
             @change='emit("update:modelValue", text)'
             @blur='editing = false'
             @submit='rows > 1 ? undefined : editing = false'
-            label=''
         />
 
         <TablerIconButton
@@ -95,7 +95,7 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, watch, computed, useTemplateRef, onMounted } from 'vue';
+import { ref, watch, computed, useTemplateRef } from 'vue';
 import CopyButton from './CopyButton.vue';
 import {
     TablerInput,
@@ -145,10 +145,10 @@ const props = defineProps({
 const editing = ref(false);
 const text = ref(props.modelValue);
 
-const infoboxRef = useTemplateRef('infobox');
+const infoboxRef = useTemplateRef<HTMLElement>('infobox');
 
 const markdown = computed(() => {
-    return (props.modelValue || '')
+    return String(props.modelValue || '')
         .replace(/\n/g, '</br>')
         .replace(/(http(s)?:\/\/.*?(\s|$))/g, '[$1]($1) ')
         .trim()
@@ -158,7 +158,10 @@ watch(infoboxRef, () => {
     if (infoboxRef.value) {
         infoboxRef.value.addEventListener('click', (event: MouseEvent) => {
             if (!props.edit) return;
-            if (['A'].includes(event.target.tagName)) return;
+            if (event.target) {
+                const target = event.target as HTMLElement;     
+                if (['A'].includes(target.tagName)) return;
+            }
             editing.value = true;
         });
     }