diff --git a/src/components/Chapters.vue b/src/components/ChaptersBar.vue
similarity index 96%
rename from src/components/Chapters.vue
rename to src/components/ChaptersBar.vue
index e87e49f4..5a273559 100644
--- a/src/components/Chapters.vue
+++ b/src/components/ChaptersBar.vue
@@ -19,7 +19,7 @@
 <script setup>
 import { defineProps, defineEmits } from "vue";
 
-const props = defineProps({
+defineProps({
     chapters: Object,
 });
 
diff --git a/src/components/CommentItem.vue b/src/components/CommentItem.vue
index 00281cad..36e805b2 100644
--- a/src/components/CommentItem.vue
+++ b/src/components/CommentItem.vue
@@ -18,7 +18,7 @@
                 </div>
 
                 <div class="comment-author">
-                    <router-link class="font-bold link" :to="comment.commentorUrl" v-text="comment.author" />
+                    <router-link class="font-bold link" :to="comment.commentorUrl">{{ comment.author }}</router-link>
                     <font-awesome-icon class="ml-1.5" v-if="comment.verified" icon="check" />
                 </div>
                 <div class="comment-meta text-sm mb-1.5" v-text="comment.commentedTime" />
diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue
index 0a4ed712..9b01a825 100644
--- a/src/components/FeedPage.vue
+++ b/src/components/FeedPage.vue
@@ -12,7 +12,7 @@
     </span>
 
     <span class="md:float-right">
-        <Sorting by-key="uploaded" @apply="order => videos.sort(order)" />
+        <SortingSelector by-key="uploaded" @apply="order => videos.sort(order)" />
     </span>
 
     <hr />
@@ -24,12 +24,12 @@
 
 <script>
 import VideoItem from "./VideoItem.vue";
-import Sorting from "./Sorting.vue";
+import SortingSelector from "./SortingSelector.vue";
 
 export default {
     components: {
         VideoItem,
-        Sorting,
+        SortingSelector,
     },
     data() {
         return {
diff --git a/src/components/HistoryPage.vue b/src/components/HistoryPage.vue
index 7870e1dd..d6cfc224 100644
--- a/src/components/HistoryPage.vue
+++ b/src/components/HistoryPage.vue
@@ -7,7 +7,7 @@
         </div>
 
         <div class="right-1">
-            <Sorting by-key="watchedAt" @apply="order => videos.sort(order)" />
+            <SortingSelector by-key="watchedAt" @apply="order => videos.sort(order)" />
         </div>
     </div>
 
@@ -22,12 +22,12 @@
 
 <script>
 import VideoItem from "./VideoItem.vue";
-import Sorting from "./Sorting.vue";
+import SortingSelector from "./SortingSelector.vue";
 
 export default {
     components: {
         VideoItem,
-        Sorting,
+        SortingSelector,
     },
     data() {
         return {
diff --git a/src/components/Sorting.vue b/src/components/SortingSelector.vue
similarity index 100%
rename from src/components/Sorting.vue
rename to src/components/SortingSelector.vue
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 5699b7c5..9f8cfd39 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -69,12 +69,9 @@
             <div class="flex">
                 <div class="flex items-center">
                     <img :src="video.uploaderAvatar" alt="" loading="lazy" class="rounded-full" />
-                    <router-link
-                        v-if="video.uploaderUrl"
-                        class="link ml-1.5"
-                        :to="video.uploaderUrl"
-                        v-text="video.uploader"
-                    />
+                    <router-link v-if="video.uploaderUrl" class="link ml-1.5" :to="video.uploaderUrl">{{
+                        video.uploader
+                    }}</router-link>
                     <font-awesome-icon class="ml-1" v-if="video.uploaderVerified" icon="check" />
                 </div>
                 <div class="relative ml-auto children:mx-2">
@@ -103,7 +100,7 @@
             />
             <!-- eslint-disable-next-line vue/no-v-html -->
             <div v-show="showDesc" class="break-words" v-html="purifyHTML(video.description)" />
-            <Chapters v-if="video?.chapters?.length > 0" :chapters="video.chapters" @seek="navigate" />
+            <ChaptersBar v-if="video?.chapters?.length > 0" :chapters="video.chapters" @seek="navigate" />
             <div
                 v-if="showDesc && sponsors && sponsors.segments"
                 v-text="`${$t('video.sponsor_segments')}: ${sponsors.segments.length}`"
@@ -170,7 +167,7 @@ import VideoPlayer from "./VideoPlayer.vue";
 import VideoItem from "./VideoItem.vue";
 import ErrorHandler from "./ErrorHandler.vue";
 import CommentItem from "./CommentItem.vue";
-import Chapters from "./Chapters.vue";
+import ChaptersBar from "./ChaptersBar.vue";
 import PlaylistAddModal from "./PlaylistAddModal.vue";
 import PlaylistVideos from "./PlaylistVideos.vue";
 
@@ -181,7 +178,7 @@ export default {
         VideoItem,
         ErrorHandler,
         CommentItem,
-        Chapters,
+        ChaptersBar,
         PlaylistAddModal,
         PlaylistVideos,
     },