diff --git a/components/ProjectGroupPicker.vue b/components/ProjectGroupPicker.vue
index 6196b13..e454cbb 100644
--- a/components/ProjectGroupPicker.vue
+++ b/components/ProjectGroupPicker.vue
@@ -92,7 +92,7 @@ const loadGroups = async (reset = false) => {
 }
 
 let timeoutId: ReturnType<typeof setTimeout>
-watch(searchText, (newVal, oldVal) => {
+watch(searchText, (newVal) => {
   if (!isOpen.value) return
   
   clearTimeout(timeoutId)
@@ -127,8 +127,11 @@ const selectGroup = (id: string) => {
 }
 
 const onFocus = (e: Event) => {
+  const wasOpen = isOpen.value
   isOpen.value = true
-  loadGroups(true)
+  if (!wasOpen) {
+    loadGroups(true)
+  }
   const target = e.target as HTMLInputElement
   if (target) {
     target.select()
diff --git a/pages/workspace/create/tdei.vue b/pages/workspace/create/tdei.vue
index 471dfba..4e9c7af 100644
--- a/pages/workspace/create/tdei.vue
+++ b/pages/workspace/create/tdei.vue
@@ -147,11 +147,12 @@
 </template>
 
 <script setup lang="ts">
-declare const L: any;
 import { LoadingContext } from '~/services/loading'
 import { TdeiImporter, TdeiImporterContext } from '~/services/import/tdei'
 import { osmClient, tdeiClient, workspacesClient } from '~/services/index'
 
+declare const L: any
+
 const context = reactive(new TdeiImporterContext())
 const importer = new TdeiImporter(workspacesClient, tdeiClient, osmClient, context)
 
diff --git a/services/tdei.ts b/services/tdei.ts
index 29d2028..0ed7c45 100644
--- a/services/tdei.ts
+++ b/services/tdei.ts
@@ -383,13 +383,13 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
     const jwt = getJwtBody(body.access_token);
 
     this.#auth.username = username;
-    this.#auth.subject = jwt.sub as unknown as string;
-    this.#auth.displayName = jwt.name as unknown as string;
-    this.#auth.email = jwt.email as unknown as string;
+    this.#auth.subject = jwt.sub as string;
+    this.#auth.displayName = jwt.name as string;
+    this.#auth.email = jwt.email as string;
     this.#auth.accessToken = body.access_token;
     this.#auth.refreshToken = body.refresh_token;
     this.#auth.expiresAt = expiresAsDate(body.expires_in);
-    this.#auth.refreshExpiresAt = expiresAsDate(body.refresh_expires_in);
+
     this.#auth.store();
 
     this.#setAuthHeader();