diff --git a/src/components/TokenEventsPanel.vue b/src/components/TokenEventsPanel.vue
index 4c427503e..618749af1 100644
--- a/src/components/TokenEventsPanel.vue
+++ b/src/components/TokenEventsPanel.vue
@@ -25,7 +25,7 @@ import TokenEventsTable from '@/components/TokenEventsTable.vue'
 import TokenEventsTableCondensed from '@/components/TokenEventsTableCondensed.vue'
 
 const { tokenEvents, tokenEventsCount } = storeToRefs(useTokenDetailsStore())
-const { fetchTokenEvents } = useTokenDetailsStore()
+const { fetchTokenEvents, fetchTokenEventsCount } = useTokenDetailsStore()
 const route = useRoute()
 
 function loadPrevEvents() {
@@ -36,6 +36,8 @@ function loadNextEvents() {
   fetchTokenEvents({ queryParameters: tokenEvents.value.next })
 }
 
+await fetchTokenEventsCount(route.params.id)
+
 if (process.client) {
   const limit = computed(() => isDesktop() ? 10 : 3)
   await fetchTokenEvents({
diff --git a/src/stores/names.js b/src/stores/names.js
index b6e0a26fc..5a01ed1c3 100644
--- a/src/stores/names.js
+++ b/src/stores/names.js
@@ -47,7 +47,7 @@ export const useNamesStore = defineStore('names', () => {
   async function fetchActiveNames({ queryParameters, limit } = {}) {
     rawActiveNames.value = null
     const { data } = await axios.get(
-      `${MIDDLEWARE_URL}${queryParameters || `/v2/names?state=active&expand=true&by=deactivation&direction=forward&limit=${limit ?? 10}`}`,
+      `${MIDDLEWARE_URL}${queryParameters || `/v2/names?state=active&by=deactivation&direction=forward&limit=${limit ?? 10}`}`,
     )
     rawActiveNames.value = data
   }
@@ -63,13 +63,13 @@ export const useNamesStore = defineStore('names', () => {
   async function fetchExpiredNames({ queryParameters, limit } = {}) {
     rawExpiredNames.value = null
     const { data } = await axios.get(
-      `${MIDDLEWARE_URL}${queryParameters || `/v2/names?state=inactive&expand=true&limit=${limit ?? 10}`}`,
+      `${MIDDLEWARE_URL}${queryParameters || `/v2/names?state=inactive&limit=${limit ?? 10}`}`,
     )
     rawExpiredNames.value = data
   }
 
   async function fetchRecentlyActivatedNames() {
-    const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/names?state=active&by=activation&direction=backward&limit=4&expand=true&by=activation`)
+    const { data } = await axios.get(`${MIDDLEWARE_URL}/v2/names?state=active&by=activation&direction=backward&limit=4&by=activation`)
     rawRecentlyActivatedNames.value = data.data
   }