diff --git a/src/components/AppContent/CircleContent.vue b/src/components/AppContent/CircleContent.vue
index 67540d295..bcbc473ab 100644
--- a/src/components/AppContent/CircleContent.vue
+++ b/src/components/AppContent/CircleContent.vue
@@ -54,7 +54,7 @@ export default {
 	props: {
 		loading: {
 			type: Boolean,
-			default: true,
+			default: false,
 		},
 	},
 
diff --git a/src/components/AppContent/ContactsContent.vue b/src/components/AppContent/ContactsContent.vue
index ea7788e34..f0a1923ed 100644
--- a/src/components/AppContent/ContactsContent.vue
+++ b/src/components/AppContent/ContactsContent.vue
@@ -88,7 +88,7 @@ export default {
 	props: {
 		loading: {
 			type: Boolean,
-			default: true,
+			default: false,
 		},
 
 		contactsList: {
@@ -97,6 +97,8 @@ export default {
 		},
 	},
 
+	emits: ['new-contact'],
+
 	data() {
 		return {
 			searchQuery: '',
diff --git a/src/components/AppNavigation/ContactsSettings.vue b/src/components/AppNavigation/ContactsSettings.vue
index 5e2099613..c1186de1c 100644
--- a/src/components/AppNavigation/ContactsSettings.vue
+++ b/src/components/AppNavigation/ContactsSettings.vue
@@ -74,6 +74,8 @@ export default {
 		},
 	},
 
+	emits: ['update:open', 'clicked', 'file-loaded'],
+
 	data() {
 		return {
 			allowSocialSync: loadState('contacts', 'allowSocialSync') !== 'no',
diff --git a/src/components/AppNavigation/GroupNavigationItem.vue b/src/components/AppNavigation/GroupNavigationItem.vue
index 675391bb0..cf51938bd 100644
--- a/src/components/AppNavigation/GroupNavigationItem.vue
+++ b/src/components/AppNavigation/GroupNavigationItem.vue
@@ -130,6 +130,8 @@ export default {
 		},
 	},
 
+	emits: ['updateRouteState'],
+
 	data() {
 		return {
 			newGroupName: '',
@@ -248,8 +250,8 @@ export default {
 		/**
 		 * Open mailto: for contacts in a group
 		 *
-		 * @param {object} group of contacts to be emailed
-		 * @param {string} mode
+		 * @param {object} group contacts to be emailed
+		 * @param {string} mode the email mode
 		 */
 		emailGroup(group, mode = 'to') {
 			const emails = []
diff --git a/src/components/AppNavigation/Settings/SettingsImportContacts.vue b/src/components/AppNavigation/Settings/SettingsImportContacts.vue
index fd6f440d4..fa9c420de 100644
--- a/src/components/AppNavigation/Settings/SettingsImportContacts.vue
+++ b/src/components/AppNavigation/Settings/SettingsImportContacts.vue
@@ -14,7 +14,6 @@
 			</NcButton>
 			<Modal
 				v-if="isOpened"
-				ref="modal"
 				class="import-contact__modal"
 				:name="t('contacts', 'Import contacts')"
 				@close="toggleModal">
diff --git a/src/components/ChartTemplate.vue b/src/components/ChartTemplate.vue
index 08d8d719a..37c10aeeb 100644
--- a/src/components/ChartTemplate.vue
+++ b/src/components/ChartTemplate.vue
@@ -56,11 +56,6 @@ export default {
 			type: Object,
 			default: () => {},
 		},
-
-		onAvatarClick: {
-			type: Function,
-			default: () => {},
-		},
 	},
 
 	computed: {
diff --git a/src/components/CircleDetails.vue b/src/components/CircleDetails.vue
index 82dd83816..07df2a027 100644
--- a/src/components/CircleDetails.vue
+++ b/src/components/CircleDetails.vue
@@ -666,10 +666,10 @@ export default {
 		},
 
 		/**
-		 * Autocomplete @mentions on the description
+		 * Autocomplete \@mentions on the description
 		 *
 		 * @param {string} search the search term
-		 * @param {Function} callback callback to be called with results array
+		 * @param {(results: Array) => void} callback callback to be called with results array
 		 */
 		onAutocomplete(search, callback) {
 			// TODO: implement autocompletion. Disabled for now
diff --git a/src/components/ConfirmationDialog.vue b/src/components/ConfirmationDialog.vue
index dc5af6ce9..95d3ae3dd 100644
--- a/src/components/ConfirmationDialog.vue
+++ b/src/components/ConfirmationDialog.vue
@@ -57,7 +57,7 @@ export default {
 
 		disabled: {
 			type: Boolean,
-			default: undefined,
+			default: false,
 		},
 	},
 
diff --git a/src/components/ContactDetails.vue b/src/components/ContactDetails.vue
index 7a66913f3..d418b390f 100644
--- a/src/components/ContactDetails.vue
+++ b/src/components/ContactDetails.vue
@@ -51,7 +51,7 @@
 				<!-- org, title -->
 				<template #subtitle>
 					<template v-if="isReadOnly">
-						<span v-html="formattedSubtitle" />
+						<span :innerHTML="formattedSubtitle" />
 					</template>
 					<template v-else>
 						<input
@@ -97,14 +97,14 @@
 								</template>
 							</ActionButton>
 							<ActionLink
-								v-for="emailAddress in emailAddressList"
-								:key="emailAddress"
+								v-for="email in emailAddressList"
+								:key="email"
 								class="quick-action"
-								:href="'mailto:' + emailAddress">
+								:href="'mailto:' + email">
 								<template #icon>
 									<IconMail :size="20" />
 								</template>
-								{{ emailAddress }}
+								{{ email }}
 							</ActionLink>
 							<ActionLink
 								v-for="phoneNumber in phoneNumberList"
@@ -181,7 +181,6 @@
 					<!-- user can clone if there is at least one option available -->
 					<ActionButton
 						v-if="isReadOnly && addressbooksOptions.length > 0"
-						ref="cloneAction"
 						:close-after-click="true"
 						@click="cloneContact">
 						<template #icon>
@@ -239,7 +238,6 @@
 				:name="t('contacts', 'Pick an address book')"
 				@close="closePickAddressbookModal">
 				<NcSelect
-					ref="pickAddressbook"
 					v-model="pickedAddressbook"
 					class="address-book"
 					:allow-empty="false"
diff --git a/src/components/ContactDetails/ContactDetailsAvatar.vue b/src/components/ContactDetails/ContactDetailsAvatar.vue
index 6a3725383..84905f3bb 100644
--- a/src/components/ContactDetails/ContactDetailsAvatar.vue
+++ b/src/components/ContactDetails/ContactDetailsAvatar.vue
@@ -173,6 +173,8 @@ export default {
 		},
 	},
 
+	emits: ['update-local-contact'],
+
 	data() {
 		return {
 			opened: false,
diff --git a/src/components/ContactDetails/ContactDetailsProperty.vue b/src/components/ContactDetails/ContactDetailsProperty.vue
index 94109bc8f..de9ee212f 100644
--- a/src/components/ContactDetails/ContactDetailsProperty.vue
+++ b/src/components/ContactDetails/ContactDetailsProperty.vue
@@ -78,11 +78,6 @@ export default {
 			default: null,
 		},
 
-		contacts: {
-			type: Array,
-			default: () => [],
-		},
-
 		bus: {
 			type: Object,
 			required: true,
diff --git a/src/components/ContactsList/Merging.vue b/src/components/ContactsList/Merging.vue
index 38491f77d..8f82d57fe 100644
--- a/src/components/ContactsList/Merging.vue
+++ b/src/components/ContactsList/Merging.vue
@@ -192,6 +192,8 @@ export default {
 		},
 	},
 
+	emits: ['finished'],
+
 	data() {
 		return {
 			bus: mitt(),
diff --git a/src/components/DetailsHeader.vue b/src/components/DetailsHeader.vue
index d02406d24..c5a8c8fec 100644
--- a/src/components/DetailsHeader.vue
+++ b/src/components/DetailsHeader.vue
@@ -31,7 +31,6 @@
 
 			<!-- menu actions -->
 			<Actions
-				ref="actions"
 				class="header-menu"
 				menu-align="right"
 				v-bind="$attrs">
diff --git a/src/components/EntityPicker/EntityBubble.vue b/src/components/EntityPicker/EntityBubble.vue
index b5865392b..adc4b0cad 100644
--- a/src/components/EntityPicker/EntityBubble.vue
+++ b/src/components/EntityPicker/EntityBubble.vue
@@ -54,6 +54,8 @@ export default {
 		},
 	},
 
+	emits: ['delete'],
+
 	methods: {
 		onDelete() {
 			// Emit delete. Be aware it might be unique
diff --git a/src/components/EntityPicker/EntityPicker.vue b/src/components/EntityPicker/EntityPicker.vue
index 6b3d745e0..17c7b0ed2 100644
--- a/src/components/EntityPicker/EntityPicker.vue
+++ b/src/components/EntityPicker/EntityPicker.vue
@@ -175,14 +175,6 @@ export default {
 			},
 		},
 
-		/**
-		 * The sorting key for the dataSet
-		 */
-		sort: {
-			type: String,
-			default: 'label',
-		},
-
 		/**
 		 * Confirm button text
 		 */
@@ -205,7 +197,7 @@ export default {
 		 */
 		internalSearch: {
 			type: Boolean,
-			default: true,
+			default: false,
 		},
 
 		/**
@@ -223,6 +215,8 @@ export default {
 		},
 	},
 
+	emits: ['update:selection', 'close', 'submit', 'search'],
+
 	data() {
 		return {
 			canInviteGuests: !!window?.OCA?.Guests?.openGuestDialog,
diff --git a/src/components/EntityPicker/NewCircleIntro.vue b/src/components/EntityPicker/NewCircleIntro.vue
index 6bd9cbc0c..7e88d814c 100644
--- a/src/components/EntityPicker/NewCircleIntro.vue
+++ b/src/components/EntityPicker/NewCircleIntro.vue
@@ -90,6 +90,8 @@ export default {
 		},
 	},
 
+	emits: ['close', 'submit'],
+
 	data() {
 		return {
 			circleName: '',
diff --git a/src/components/MemberList/MemberList.vue b/src/components/MemberList/MemberList.vue
index e751aa41d..c7a60838d 100644
--- a/src/components/MemberList/MemberList.vue
+++ b/src/components/MemberList/MemberList.vue
@@ -61,6 +61,7 @@ import { t } from '@nextcloud/l10n'
 import { NcEmptyContent } from '@nextcloud/vue'
 import { defineComponent } from 'vue'
 import IconContact from 'vue-material-design-icons/AccountMultipleOutline.vue'
+import IconLoading from 'vue-material-design-icons/Loading.vue'
 import EntityPicker from '../EntityPicker/EntityPicker.vue'
 import MemberGridItem from './MemberGridItem.vue'
 import IsMobileMixin from '../../mixins/IsMobileMixin.ts'
@@ -74,6 +75,7 @@ export default defineComponent({
 	components: {
 		EntityPicker,
 		IconContact,
+		IconLoading,
 		MemberGridItem,
 		NcEmptyContent,
 	},
diff --git a/src/components/MemberList/MemberListItem.vue b/src/components/MemberList/MemberListItem.vue
index 7dcf03f87..fccf5f9c0 100644
--- a/src/components/MemberList/MemberListItem.vue
+++ b/src/components/MemberList/MemberListItem.vue
@@ -88,6 +88,7 @@ import {
 	NcActionSeparator,
 	NcActionText,
 	NcAvatar,
+	NcButton,
 	NcListItem,
 } from '@nextcloud/vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
@@ -113,6 +114,7 @@ export default {
 		NcActionSeparator,
 		NcActionText,
 		NcAvatar,
+		NcButton,
 	},
 
 	mixins: [RouterMixin],
diff --git a/src/components/OrgChart.vue b/src/components/OrgChart.vue
index b3fefb429..8b64da738 100644
--- a/src/components/OrgChart.vue
+++ b/src/components/OrgChart.vue
@@ -25,6 +25,7 @@
 </template>
 
 <script>
+/* eslint-disable vue/one-component-per-file */
 import { getLocale } from '@nextcloud/l10n'
 import { NcSelect } from '@nextcloud/vue'
 import * as d3 from 'd3'
diff --git a/src/components/Properties/PropertyActions.vue b/src/components/Properties/PropertyActions.vue
index a80772c99..2ce400062 100644
--- a/src/components/Properties/PropertyActions.vue
+++ b/src/components/Properties/PropertyActions.vue
@@ -47,6 +47,8 @@ export default {
 		},
 	},
 
+	emits: ['delete'],
+
 	methods: {
 		deleteProperty() {
 			this.$emit('delete')
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index 51ba91862..23d783340 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -104,6 +104,8 @@ export default {
 		},
 	},
 
+	emits: ['update:value'],
+
 	data() {
 		return {
 			// input type following DatePicker docs
diff --git a/src/components/Properties/PropertyGroups.vue b/src/components/Properties/PropertyGroups.vue
index a7228bf21..25b474991 100644
--- a/src/components/Properties/PropertyGroups.vue
+++ b/src/components/Properties/PropertyGroups.vue
@@ -83,11 +83,6 @@ export default {
 			required: true,
 		},
 
-		contact: {
-			type: Contact,
-			required: true,
-		},
-
 		// Is it read-only?
 		isReadOnly: {
 			type: Boolean,
@@ -95,6 +90,8 @@ export default {
 		},
 	},
 
+	emits: ['update:value'],
+
 	data() {
 		return {
 			localValue: [...this.value].sort(),
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index 83a31f333..5728589e8 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -105,7 +105,7 @@
 		<!-- no order enforced: just iterate on all the values -->
 		<template v-else>
 			<div
-				v-for="(value, index) in filteredValue"
+				v-for="(item, index) in filteredValue"
 				:key="index"
 				class="property__row">
 				<template v-if="(isReadOnly && filteredValue[index]) || !isReadOnly">
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index 2d111cfd4..09506640b 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -73,11 +73,6 @@ export default {
 	mixins: [PropertyMixin],
 
 	props: {
-		value: {
-			type: [Object, String, Array],
-			required: true,
-		},
-
 		hideActions: {
 			type: Boolean,
 			default: false,
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index 82fe603c2..e9949feda 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -142,11 +142,6 @@ export default {
 			type: String,
 			default: 'text',
 		},
-
-		value: {
-			type: String,
-			required: true,
-		},
 	},
 
 	data() {
diff --git a/src/components/Properties/PropertyTitle.vue b/src/components/Properties/PropertyTitle.vue
index 8759c3f45..cf286d850 100644
--- a/src/components/Properties/PropertyTitle.vue
+++ b/src/components/Properties/PropertyTitle.vue
@@ -73,6 +73,7 @@ export default {
 		bus: {
 			type: Object,
 			required: false,
+			default: () => ({}),
 		},
 	},
 
diff --git a/src/models/circle.ts b/src/models/circle.ts
index 5dae65dac..cdb800c47 100644
--- a/src/models/circle.ts
+++ b/src/models/circle.ts
@@ -17,7 +17,7 @@ export default class Circle {
 	/**
 	 * Creates an instance of Circle
 	 *
-	 * @param data
+	 * @param data the circle data
 	 */
 	constructor(data: object) {
 		this.updateData(data)
@@ -26,7 +26,7 @@ export default class Circle {
 	/**
 	 * Update inner circle data, owner and initiator
 	 *
-	 * @param data
+	 * @param data the circle data to update
 	 */
 	updateData(data: any) {
 		if (typeof data !== 'object') {
@@ -151,7 +151,7 @@ export default class Circle {
 	/**
 	 * Add a member to this circle
 	 *
-	 * @param member
+	 * @param member the member to add
 	 */
 	addMember(member: Member) {
 		if (member.constructor.name !== Member.name) {
@@ -168,7 +168,7 @@ export default class Circle {
 	/**
 	 * Remove a member from this circle
 	 *
-	 * @param member
+	 * @param member the member to remove
 	 */
 	deleteMember(member: Member) {
 		if (member.constructor.name !== Member.name) {
diff --git a/src/models/member.ts b/src/models/member.ts
index f7f427df8..785ba6b32 100644
--- a/src/models/member.ts
+++ b/src/models/member.ts
@@ -16,8 +16,8 @@ export default class Member {
 	/**
 	 * Creates an instance of Member
 	 *
-	 * @param data
-	 * @param circle
+	 * @param data the member data
+	 * @param circle the circle this member belongs to
 	 */
 	constructor(data: any, circle: Circle) {
 		if (typeof data !== 'object') {
diff --git a/src/services/circles.d.ts b/src/services/circles.d.ts
index c8a885973..1f38ca319 100644
--- a/src/services/circles.d.ts
+++ b/src/services/circles.d.ts
@@ -21,84 +21,83 @@ interface CircleSetting {
 /**
  * Get the circles list without the members
  *
- * @return {Array}
+ * @return
  */
 export declare const getCircles: () => Promise<any>
 /**
  * Get a specific circle
  *
- * @param {string} circleId
- * @return {object}
+ * @param circleId
+ * @return
  */
 export declare const getCircle: (circleId: string) => Promise<any>
 /**
  * Create a new circle
  *
- * @param {string} name the circle name
+ * @param name the circle name
  * @param personal
  * @param local
- * @return {object}
+ * @return
  */
 export declare const createCircle: (name: string, personal: boolean, local: boolean) => Promise<any>
 /**
  * Delete an existing circle
  *
- * @param {string} circleId the circle id
- * @return {object}
+ * @param circleId the circle id
+ * @return
  */
 export declare const deleteCircle: (circleId: string) => Promise<any>
 /**
  * Edit an existing circle
  *
- * @param {string} circleId the circle id
- * @param {CircleEditType} type the edit type
- * @param {any} data the data
- * @param value
- * @return {object}
+ * @param circleId the circle id
+ * @param type the edit type
+ * @param value the data value
+ * @return
  */
 export declare const editCircle: (circleId: string, type: CircleEditType, value: any) => Promise<any>
 /**
  * Join a circle
  *
- * @param {string} circleId the circle id
- * @return {Array}
+ * @param circleId the circle id
+ * @return
  */
 export declare const joinCircle: (circleId: string) => Promise<any>
 /**
  * Leave a circle
  *
- * @param {string} circleId the circle id
- * @return {Array}
+ * @param circleId the circle id
+ * @return
  */
 export declare const leaveCircle: (circleId: string) => Promise<any>
 /**
  * Get the circle members without the members
  *
- * @param {string} circleId the circle id
- * @return {Array}
+ * @param circleId the circle id
+ * @return
  */
 export declare const getCircleMembers: (circleId: string) => Promise<any>
 /**
  * Search a potential circle member
  *
- * @param {string} term the search query
- * @return {Array}
+ * @param term the search query
+ * @return
  */
 export declare const searchMember: (term: string) => Promise<any>
 /**
  * Add a circle member
  *
- * @param {string} circleId the circle id
- * @param {string} members the member id
- * @return {Array}
+ * @param circleId the circle id
+ * @param members the member id
+ * @return
  */
 export declare const addMembers: (circleId: string, members: Array<MemberPairs>) => Promise<any>
 /**
  * Delete a circle member
  *
- * @param {string} circleId the circle id
- * @param {string} memberId the member id
- * @return {Array}
+ * @param circleId the circle id
+ * @param memberId the member id
+ * @return
  */
 export declare const deleteMember: (circleId: string, memberId: string) => Promise<unknown[]>
 /**
@@ -106,18 +105,18 @@ export declare const deleteMember: (circleId: string, memberId: string) => Promi
  *
  * @see levels file src/models/constants.js
  *
- * @param {string} circleId the circle id
- * @param {string} memberId the member id
- * @param {number} level the new member level
- * @return {Array}
+ * @param circleId the circle id
+ * @param memberId the member id
+ * @param level the new member level
+ * @return
  */
 export declare const changeMemberLevel: (circleId: string, memberId: string, level: MemberLevel) => Promise<unknown[]>
 /**
  * Accept a circle member request
  *
- * @param {string} circleId the circle id
- * @param {string} memberId the member id
- * @return {Array}
+ * @param circleId the circle id
+ * @param memberId the member id
+ * @return
  */
 export declare const acceptMember: (circleId: string, memberId: string) => Promise<any>
 export declare const editCircleSetting: (circleId: string, setting: CircleSetting) => Promise<any>
diff --git a/src/services/circles.ts b/src/services/circles.ts
index d833200f5..c9d64ff13 100644
--- a/src/services/circles.ts
+++ b/src/services/circles.ts
@@ -29,7 +29,7 @@ interface CircleSetting {
 /**
  * Get the circles list without the members
  *
- * @return
+ * @return the circles list
  */
 export async function getCircles() {
 	const response = await axios.get(generateOcsUrl('apps/circles/circles'))
@@ -39,8 +39,8 @@ export async function getCircles() {
 /**
  * Get a specific circle
  *
- * @param circleId
- * @return
+ * @param circleId the circle id
+ * @return the circle data
  */
 export async function getCircle(circleId: string) {
 	const response = await axios.get(generateOcsUrl('apps/circles/circles/{circleId}', { circleId }))
@@ -51,9 +51,9 @@ export async function getCircle(circleId: string) {
  * Create a new circle
  *
  * @param name the circle name
- * @param personal
- * @param local
- * @return
+ * @param personal whether the circle is personal
+ * @param local whether the circle is local
+ * @return the created circle data
  */
 export async function createCircle(name: string, personal: boolean, local: boolean) {
 	const response = await axios.post(generateOcsUrl('apps/circles/circles'), {
@@ -80,9 +80,8 @@ export async function deleteCircle(circleId: string) {
  *
  * @param circleId the circle id
  * @param type the edit type
- * @param data the data
- * @param value
- * @return
+ * @param value the data value
+ * @return the updated circle data
  */
 export async function editCircle(circleId: string, type: CircleEditType, value: any) {
 	const response = await axios.put(generateOcsUrl('apps/circles/circles/{circleId}/{type}', { circleId, type }), { value })
diff --git a/src/services/validate.js b/src/services/validate.js
index c6f0d2202..18ac89ab5 100644
--- a/src/services/validate.js
+++ b/src/services/validate.js
@@ -7,7 +7,9 @@ import Contact from '../models/contact.js'
 import checks from './checks/index.js'
 
 /**
- * @param contact
+ * Validate and fix a contact
+ *
+ * @param {Contact} contact the contact to validate and fix
  */
 export default function(contact) {
 	let result = false
diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js
index b84437f4d..19d6c0957 100644
--- a/src/store/addressbooks.js
+++ b/src/store/addressbooks.js
@@ -228,7 +228,7 @@ const mutations = {
 	/**
 	 * Needed to track indirect state changes for addressbook sorting
 	 *
-	 * @param state
+	 * @param {object} state the store state
 	 */
 	resortAddressbooks(state) {
 		state.addressbooks = sortAddressbooks(state.addressbooks)
@@ -347,15 +347,11 @@ const actions = {
 	/**
 	 * Rename a Addressbook
 	 *
-	 * @param {object} context the store mutations Current context
+	 * @param {object} context the store mutations current context
+	 * @param {object} data destructuring object
 	 * @param {object} data.addressbook the addressbook to rename
 	 * @param {string} data.newName the new name of the addressbook
-	 * @param data.addressbook.addressbook
-	 * @param data.addressbook.newName
-	 * @param root0
-	 * @param root0.addressbook
-	 * @param root0.newName
-	 * @return {Promise}
+	 * @return {Promise} the updated addressbook
 	 */
 	async renameAddressbook(context, { addressbook, newName }) {
 		addressbook.dav.displayname = newName
@@ -370,9 +366,9 @@ const actions = {
 	 * and commit the results
 	 *
 	 * @param {object} context the store mutations
-	 * @param {object} importDetails = { vcf, addressbook }
-	 * @param importDetails.addressbook
-	 * @return {Promise}
+	 * @param {object} data destructuring object containing addressbook
+	 * @param {object} data.addressbook the addressbook to fetch contacts from
+	 * @return {Promise} promise that resolves when complete
 	 */
 	async getContactsFromAddressBook(context, { addressbook }) {
 		return addressbook.dav
@@ -426,11 +422,12 @@ const actions = {
 	},
 
 	/**
+	 * Import contacts into an addressbook
 	 *
 	 * @param {object} context the store mutations
-	 * @param {object} importDetails = { vcf, addressbook }
-	 * @param importDetails.vcf
-	 * @param importDetails.addressbook
+	 * @param {object} data destructuring object
+	 * @param {string} data.vcf the vcard data to import
+	 * @param {object} data.addressbook the addressbook to import into
 	 */
 	async importContactsIntoAddressbook(context, { vcf, addressbook }) {
 		const contacts = parseVcf(vcf, addressbook)
@@ -514,23 +511,13 @@ const actions = {
 	/**
 	 * Share Adressbook with User or Group
 	 *
-	 * @param {object} context the store mutations Current context
-	 * @param {object} data.addressbook the addressbook
+	 * @param {object} context the store mutations current context
+	 * @param {object} data destructuring object
+	 * @param {object} data.addressbook the addressbook to share
 	 * @param {string} data.user the userId
-	 * @param {string} data.displayName the displayName
-	 * @param {string} data.uri the sharing principalScheme uri
-	 * @param {boolean} data.isGroup is this a group ?
-	 * @param data.addressbook.addressbook
-	 * @param data.addressbook.user
-	 * @param data.addressbook.displayName
-	 * @param data.addressbook.uri
-	 * @param data.addressbook.isGroup
-	 * @param root0
-	 * @param root0.addressbook
-	 * @param root0.user
-	 * @param root0.displayName
-	 * @param root0.uri
-	 * @param root0.isGroup
+	 * @param {string} data.displayName the display name of the sharee
+	 * @param {string} data.uri the sharing principal scheme uri
+	 * @param {boolean} data.isGroup whether this is a group
 	 */
 	async shareAddressbook(context, { addressbook, user, displayName, uri, isGroup }) {
 		// Share addressbook with entered group or user
diff --git a/src/store/circles.js b/src/store/circles.js
index 3107482f8..51b6b54dd 100644
--- a/src/store/circles.js
+++ b/src/store/circles.js
@@ -226,9 +226,10 @@ const actions = {
 	/**
 	 * Delete a member from a circle
 	 *
-	 * @param {object} context the store mutations Current context
-	 * @param {Member} member the member to remove
-	 * @param {boolean} [leave] leave the circle instead of removing the member
+	 * @param {object} context the store mutations current context
+	 * @param {object} data destructuring object
+	 * @param {Member} data.member the member to remove
+	 * @param {boolean} data.leave whether to leave the circle instead of removing the member
 	 */
 	async deleteMemberFromCircle(context, { member, leave = false }) {
 		const circleId = member.circle.id
diff --git a/src/store/contacts.js b/src/store/contacts.js
index e4c50ffab..5f5ac0deb 100644
--- a/src/store/contacts.js
+++ b/src/store/contacts.js
@@ -156,10 +156,8 @@ const mutations = {
 	 *
 	 * @param {object} state the store data
 	 * @param {object} data destructuring object
-	 * @param data.contact
-	 * @param {Contact} contact the contact to update
-	 * @param {object} addressbook the addressbook to set
-	 * @param data.addressbook
+	 * @param {Contact} data.contact the contact to update
+	 * @param {object} data.addressbook the addressbook to set
 	 */
 	updateContactAddressbook(state, { contact, addressbook }) {
 		if (state.contacts[contact.key] && contact instanceof Contact) {
@@ -192,10 +190,8 @@ const mutations = {
 	 *
 	 * @param {object} state the store data
 	 * @param {object} data destructuring object
-	 * @param data.contact
-	 * @param {Contact} contact the contact to update
-	 * @param {string} etag the contact etag
-	 * @param data.etag
+	 * @param {Contact} data.contact the contact to update
+	 * @param {string} data.etag the contact etag
 	 */
 	updateContactEtag(state, { contact, etag }) {
 		if (state.contacts[contact.key] && contact instanceof Contact) {
@@ -369,8 +365,8 @@ const actions = {
 	 * @param {object} data destructuring object
 	 * @param {Contact} data.contact the contact to fetch
 	 * @param {string} data.etag the contact etag to override in case of conflict
-	 * @param data.forceReFetch
-	 * @return {Promise}
+	 * @param {boolean} data.forceReFetch whether to force refetch of data
+	 * @return {Promise} promise that resolves when complete
 	 */
 	async fetchFullContact(context, { contact, etag = '', forceReFetch = false }) {
 		if (etag.trim() !== '') {
diff --git a/src/utils/addressbookUtils.js b/src/utils/addressbookUtils.js
index dd9a193ef..1023b14aa 100644
--- a/src/utils/addressbookUtils.js
+++ b/src/utils/addressbookUtils.js
@@ -12,8 +12,8 @@ import usePrincipalsStore from '../store/principals.js'
  *
  *  Withing each group, addressbooks are sorted by the number of contacts, from highest to lowest
  *
- * @param {Array} addressbooks
- * @return {Array}
+ * @param {Array} addressbooks the addressbooks to sort
+ * @return {Array} the sorted addressbooks
  */
 export function sortAddressbooks(addressbooks) {
 	return addressbooks
@@ -43,8 +43,10 @@ export function sortAddressbooks(addressbooks) {
 }
 
 /**
+ * Get the priority group for an addressbook
  *
- * @param ab
+ * @param {object} ab the addressbook
+ * @return {number} the priority group (1-3)
  */
 function getPriorityGroup(ab) {
 	const principalsStore = usePrincipalsStore()
diff --git a/src/utils/matchTypes.d.ts b/src/utils/matchTypes.d.ts
index 90de6f571..23ab4a005 100644
--- a/src/utils/matchTypes.d.ts
+++ b/src/utils/matchTypes.d.ts
@@ -5,8 +5,8 @@
 /**
  * Match a list of types against the available types
  *
- * @param selectedTypes
- * @param options
+ * @param selectedTypes the selected types to match
+ * @param options the available type options
  */
 export declare function matchTypes(selectedTypes: Array<string>, options: Array<{
 	id: string
diff --git a/src/utils/matchTypes.ts b/src/utils/matchTypes.ts
index d5f3e862b..c3de27ff5 100644
--- a/src/utils/matchTypes.ts
+++ b/src/utils/matchTypes.ts
@@ -6,8 +6,8 @@
 /**
  * Match a list of types against the available types
  *
- * @param selectedTypes
- * @param options
+ * @param selectedTypes the selected types to match
+ * @param options the available type options
  */
 export function matchTypes(selectedTypes: Array<string>, options: Array<{ id: string, name: string }>) {
 	const items = options.map((option) => {
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index befd9f7dc..9225c42b4 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -72,6 +72,7 @@ import IconAdd from 'vue-material-design-icons/Plus.vue'
 import ChartContent from '../components/AppContent/ChartContent.vue'
 import CircleContent from '../components/AppContent/CircleContent.vue'
 import ContactsContent from '../components/AppContent/ContactsContent.vue'
+import UserGroupContent from '../components/AppContent/UserGroupContent.vue'
 import RootNavigation from '../components/AppNavigation/RootNavigation.vue'
 import SettingsImportContacts from '../components/AppNavigation/Settings/SettingsImportContacts.vue'
 import ContactsPicker from '../components/EntityPicker/ContactsPicker.vue'
@@ -94,6 +95,7 @@ export default {
 		CircleContent,
 		ChartContent,
 		ContactsContent,
+		UserGroupContent,
 		ContactsPicker,
 		Content,
 		ImportView,
diff --git a/src/views/Processing/AddToGroupView.vue b/src/views/Processing/AddToGroupView.vue
index 58c9a9ce3..853294c99 100644
--- a/src/views/Processing/AddToGroupView.vue
+++ b/src/views/Processing/AddToGroupView.vue
@@ -58,6 +58,8 @@ export default {
 		},
 	},
 
+	emits: ['close'],
+
 	computed: {
 		progressHeader() {
 			return n(
diff --git a/src/views/Processing/ImportView.vue b/src/views/Processing/ImportView.vue
index b74f1f105..8d3a3f262 100644
--- a/src/views/Processing/ImportView.vue
+++ b/src/views/Processing/ImportView.vue
@@ -31,6 +31,8 @@ export default {
 		NcButton,
 	},
 
+	emits: ['close'],
+
 	computed: {
 		importState() {
 			return this.$store.getters.getImportState
diff --git a/src/views/ReadOnlyContactDetails.vue b/src/views/ReadOnlyContactDetails.vue
index 4eb425a16..d1ac6350b 100644
--- a/src/views/ReadOnlyContactDetails.vue
+++ b/src/views/ReadOnlyContactDetails.vue
@@ -24,7 +24,7 @@
 			<div class="contact-title">
 				<h6>{{ contact.fullName }}</h6>
 				<!-- Subtitle -->
-				<span v-html="formattedSubtitle" />
+				<span :innerHTML="formattedSubtitle" />
 			</div>
 			<div class="contact-details-wrapper">
 				<div
@@ -81,12 +81,6 @@ export default {
 			type: String,
 			required: true,
 		},
-
-		desc: {
-			type: String,
-			required: false,
-			default: '',
-		},
 	},
 
 	data() {