diff --git a/packages/vue/src/components/BaseTimer/BaseTimer.vue b/packages/vue/src/components/BaseTimer/BaseTimer.vue
index 1fffd1eb..8555d8d2 100644
--- a/packages/vue/src/components/BaseTimer/BaseTimer.vue
+++ b/packages/vue/src/components/BaseTimer/BaseTimer.vue
@@ -51,9 +51,10 @@
 <script lang="ts">
 import type { PropType } from 'vue'
 import { defineComponent } from 'vue'
-import dayjs, { type Dayjs } from 'dayjs'
-import duration, { type Duration } from 'dayjs/plugin/duration'
-import minMax from 'dayjs/plugin/minMax'
+import dayjs from './../../utils/dayjs'
+import { type Dayjs } from 'dayjs'
+import duration, { type Duration } from 'dayjs/plugin/duration.js'
+import minMax from 'dayjs/plugin/minMax.js'
 
 dayjs.extend(duration)
 dayjs.extend(minMax)
diff --git a/packages/vue/src/components/NavSearchForm/NavSearchForm.vue b/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
index d128d367..5d901277 100644
--- a/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
+++ b/packages/vue/src/components/NavSearchForm/NavSearchForm.vue
@@ -1,3 +1,29 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import SearchInput from './../SearchInput/SearchInput.vue'
+const router = useRouter()
+
+interface NavSearchFormProps {
+  mobile?: boolean
+}
+const props = withDefaults(defineProps<NavSearchFormProps>(), {
+  mobile: false
+})
+const emit = defineEmits(['clearSearch', 'submitForm'])
+
+const searchQuery = ref()
+
+const clearSearch = () => {
+  searchQuery.value = undefined
+  emit('clearSearch')
+}
+const submitSearch = () => {
+  emit('submitForm')
+  console.log(searchQuery.value)
+  router.push({ path: '/search', query: searchQuery.value })
+}
+</script>
 <template>
   <form
     class="NavSearchForm"
@@ -6,11 +32,11 @@
     <SearchInput
       v-model="searchQuery"
       placeholder="Search JPL"
-      :underlined-input="!mobile"
+      :underlined-input="!props.mobile"
       :underlined-input-value="searchQuery"
-      :auto-focus="!mobile"
-      :inline="!mobile"
-      :default-colors="mobile"
+      :auto-focus="!props.mobile"
+      :inline="!props.mobile"
+      :default-colors="props.mobile"
       @esc="clearSearch()"
     />
     <button
@@ -22,43 +48,6 @@
     </button>
   </form>
 </template>
-<script lang="ts">
-import { defineComponent } from 'vue'
-import SearchInput from './../SearchInput/SearchInput.vue'
-
-export default defineComponent({
-  name: 'NavSearchForm',
-  components: {
-    SearchInput
-  },
-  props: {
-    mobile: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      searchQuery: undefined
-    }
-  },
-  methods: {
-    clearSearch() {
-      this.searchQuery = undefined
-      this.$emit('clearSearch')
-    },
-    submitSearch() {
-      this.$emit('submitForm')
-      if (this.$router) {
-        this.$router.push({
-          name: 'search',
-          query: { query: this.searchQuery }
-        })
-      }
-    }
-  }
-})
-</script>
 <style lang="scss">
 .NavSearchForm {
   ::placeholder {
diff --git a/packages/vue/src/components/PastEventsCarousel/PastEventsCarousel.vue b/packages/vue/src/components/PastEventsCarousel/PastEventsCarousel.vue
index 63439306..8cee717e 100644
--- a/packages/vue/src/components/PastEventsCarousel/PastEventsCarousel.vue
+++ b/packages/vue/src/components/PastEventsCarousel/PastEventsCarousel.vue
@@ -4,7 +4,7 @@
     heading="Past Events"
     variant="cards"
     :link="{
-      path: '/events',
+      // path: 'events',
       query: {
         event_status: 'Past events',
         sortBy: 'eventStartDateLatest',
@@ -28,7 +28,7 @@
   </MixinCarousel>
 </template>
 <script lang="ts">
-// @ts-nocheck
+// relative link to view past events assumes that this component will only be used on an events index page.
 import { defineComponent } from 'vue'
 import type { ElasticSearchPage } from '../../interfaces'
 import MixinCarousel from './../MixinCarousel/MixinCarousel.vue'