diff --git a/src/modules/market/components/LoadingErrorState.vue b/src/modules/market/components/LoadingErrorState.vue
index 8652e8f..06d160a 100644
--- a/src/modules/market/components/LoadingErrorState.vue
+++ b/src/modules/market/components/LoadingErrorState.vue
@@ -65,7 +65,6 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
 import { Button } from '@/components/ui/button'
 import { AlertCircle } from 'lucide-vue-next'
 
@@ -116,7 +115,7 @@ interface Emits {
   (e: 'retry'): void
 }
 
-const props = withDefaults(defineProps<Props>(), {
+withDefaults(defineProps<Props>(), {
   isLoading: false,
   hasError: false,
   showRetry: true,
@@ -124,7 +123,7 @@ const props = withDefaults(defineProps<Props>(), {
   fullHeight: true
 })
 
-const emit = defineEmits<Emits>()
+defineEmits<Emits>()
 </script>
 
 <style scoped>
diff --git a/src/modules/market/components/MarketSearchBar.vue b/src/modules/market/components/MarketSearchBar.vue
index 8c80f22..f1ccea6 100644
--- a/src/modules/market/components/MarketSearchBar.vue
+++ b/src/modules/market/components/MarketSearchBar.vue
@@ -292,14 +292,26 @@ const handleClear = () => {
 }
 
 const handleKeydown = (event: KeyboardEvent) => {
-  if (!props.showEnhancements || !useSearchKeyboardShortcuts.value) return
+  if (!props.showEnhancements) return
 
-  const shouldClear = handleSearchKeydown(event)
-  if (shouldClear) {
+  // Handle basic Escape key for simple mode
+  if (event.key === 'Escape') {
+    event.preventDefault()
     if (searchQuery.value) {
       handleClear()
-    } else {
-      blurSearchInput()
+    }
+    return
+  }
+
+  // Use enhanced keyboard shortcuts if available
+  if (useSearchKeyboardShortcuts.value && handleSearchKeydown) {
+    const shouldClear = handleSearchKeydown(event)
+    if (shouldClear) {
+      if (searchQuery.value) {
+        handleClear()
+      } else {
+        blurSearchInput()
+      }
     }
   }
 }
@@ -347,7 +359,7 @@ const handleBlur = () => {
 // Enhanced mode methods (initialized conditionally)
 let focusSearchInput = () => {}
 let blurSearchInput = () => {}
-let handleSearchKeydown = () => false
+let handleSearchKeydown = (_event: KeyboardEvent) => false
 
 // Initialize keyboard shortcuts for enhanced mode
 watch(() => props.showEnhancements, async (showEnhancements) => {
diff --git a/src/modules/market/components/MerchantStore.vue b/src/modules/market/components/MerchantStore.vue
index 0dd0811..2ded586 100644
--- a/src/modules/market/components/MerchantStore.vue
+++ b/src/modules/market/components/MerchantStore.vue
@@ -1,44 +1,56 @@
 <template>
   <div class="space-y-6">
-    <LoadingErrorState
-      :is-loading="isLoadingMerchant"
-      loading-message="Loading your merchant profile..."
-      :has-error="!!merchantCheckError"
-      error-title="Error Loading Merchant Status"
-      :error-message="merchantCheckError || ''"
-      @retry="checkMerchantProfile"
-      :full-height="false"
-    >
-    <!-- No Merchant Profile Empty State -->
-    <div v-if="!userHasMerchantProfile" class="flex flex-col items-center justify-center py-12">
-      <div class="w-24 h-24 bg-muted rounded-full flex items-center justify-center mb-6">
-        <User class="w-12 h-12 text-muted-foreground" />
+    <!-- Loading State -->
+    <div v-if="isLoadingMerchant" class="flex justify-center items-center py-12">
+      <div class="flex flex-col items-center space-y-4">
+        <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600"></div>
+        <p class="text-gray-600">Loading your merchant profile...</p>
       </div>
-      <h2 class="text-2xl font-bold text-foreground mb-2">Create Your Merchant Profile</h2>
-      <p class="text-muted-foreground text-center mb-6 max-w-md">
-        Before you can create a store, you need to set up your merchant profile. This will create your merchant identity on the Nostr marketplace.
-      </p>
-      <Button 
-        @click="createMerchantProfile" 
-        variant="default" 
-        size="lg"
-        :disabled="isCreatingMerchant"
-      >
-        <div v-if="isCreatingMerchant" class="flex items-center">
-          <div class="animate-spin rounded-full h-5 w-5 border-b-2 border-white mr-2"></div>
-          <span>Creating...</span>
-        </div>
-        <div v-else class="flex items-center">
-          <Plus class="w-5 h-5 mr-2" />
-          <span>Create Merchant Profile</span>
-        </div>
-      </Button>
     </div>
 
-    <!-- Stores Grid (shown when merchant profile exists) -->
+    <!-- Error State -->
+    <div v-else-if="merchantCheckError" class="flex justify-center items-center py-12">
+      <div class="text-center">
+        <h2 class="text-2xl font-bold text-red-600 mb-4">Error Loading Merchant Status</h2>
+        <p class="text-gray-600 mb-4">{{ merchantCheckError }}</p>
+        <Button @click="checkMerchantProfile" variant="outline">
+          Try Again
+        </Button>
+      </div>
+    </div>
+
+    <!-- Content -->
     <div v-else>
-      <!-- Header Section -->
-      <div class="mb-8">
+      <!-- No Merchant Profile Empty State -->
+      <div v-if="!userHasMerchantProfile" class="flex flex-col items-center justify-center py-12">
+        <div class="w-24 h-24 bg-muted rounded-full flex items-center justify-center mb-6">
+          <User class="w-12 h-12 text-muted-foreground" />
+        </div>
+        <h2 class="text-2xl font-bold text-foreground mb-2">Create Your Merchant Profile</h2>
+        <p class="text-muted-foreground text-center mb-6 max-w-md">
+          Before you can create a store, you need to set up your merchant profile. This will create your merchant identity on the Nostr marketplace.
+        </p>
+        <Button
+          @click="createMerchantProfile"
+          variant="default"
+          size="lg"
+          :disabled="isCreatingMerchant"
+        >
+          <div v-if="isCreatingMerchant" class="flex items-center">
+            <div class="animate-spin rounded-full h-5 w-5 border-b-2 border-white mr-2"></div>
+            <span>Creating...</span>
+          </div>
+          <div v-else class="flex items-center">
+            <Plus class="w-5 h-5 mr-2" />
+            <span>Create Merchant Profile</span>
+          </div>
+        </Button>
+      </div>
+
+      <!-- Stores Grid (shown when merchant profile exists) -->
+      <div v-else>
+        <!-- Header Section -->
+        <div class="mb-8">
         <div class="flex items-center justify-between mb-2">
           <div>
             <h2 class="text-2xl font-bold text-foreground">My Stores</h2>
@@ -297,25 +309,23 @@
     </div>
   </div>
 
-  <!-- Create Store Dialog -->
-  <CreateStoreDialog 
-    :is-open="showCreateStoreDialog"
-    @close="showCreateStoreDialog = false"
-    @created="onStoreCreated"
-  />
+      <!-- Create Store Dialog -->
+      <CreateStoreDialog
+        :is-open="showCreateStoreDialog"
+        @close="showCreateStoreDialog = false"
+        @created="onStoreCreated"
+      />
 
-  <!-- Create Product Dialog -->
-  <CreateProductDialog 
-    :is-open="showCreateProductDialog"
-    :stall="activeStall"
-    :product="editingProduct"
-    @close="closeProductDialog"
-    @created="onProductCreated"
-    @updated="onProductUpdated"
-  />
-
-    </LoadingErrorState>
-  </div>
+      <!-- Create Product Dialog -->
+      <CreateProductDialog
+        :is-open="showCreateProductDialog"
+        :stall="activeStall"
+        :product="editingProduct"
+        @close="closeProductDialog"
+        @created="onProductCreated"
+        @updated="onProductUpdated"
+      />
+    </div>
 </template>
 
 <script setup lang="ts">
@@ -324,14 +334,12 @@ import { useRouter } from 'vue-router'
 import { useMarketStore } from '@/modules/market/stores/market'
 import { Button } from '@/components/ui/button'
 import { Badge } from '@/components/ui/badge'
-import LoadingErrorState from './LoadingErrorState.vue'
-import { 
-  Package, 
-  Store, 
-  DollarSign, 
-  Star, 
-  Plus, 
-  AlertCircle,
+import {
+  Package,
+  Store,
+  DollarSign,
+  Star,
+  Plus,
   User
 } from 'lucide-vue-next'
 import type { NostrmarketAPI, Merchant, Stall } from '../services/nostrmarketAPI'
@@ -632,4 +640,4 @@ watch(() => activeStallId.value, async (newStallId) => {
     stallProducts.value = []
   }
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/modules/market/views/MarketPage.vue b/src/modules/market/views/MarketPage.vue
index 976230d..12381fd 100644
--- a/src/modules/market/views/MarketPage.vue
+++ b/src/modules/market/views/MarketPage.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="container mx-auto px-4 py-8">
     <LoadingErrorState
-      :is-loading="!isMarketReady && ((marketStore.isLoading ?? false) || marketPreloader.isPreloading)"
-      :loading-message="marketPreloader.isPreloading ? 'Preloading market...' : 'Loading market...'"
-      :has-error="!!(marketStore.error || marketPreloader.preloadError) && marketStore.products.length === 0"
+      :is-loading="!isMarketReady && ((marketStore.isLoading ?? false) || marketPreloader.isPreloading.value)"
+      :loading-message="marketPreloader.isPreloading.value ? 'Preloading market...' : 'Loading market...'"
+      :has-error="!!(marketStore.error || marketPreloader.preloadError.value) && marketStore.products.length === 0"
       error-title="Failed to load market"
-      :error-message="marketStore.error || marketPreloader.preloadError || ''"
+      :error-message="marketStore.error || marketPreloader.preloadError.value || ''"
       @retry="retryLoadMarket"
     >
       <!-- Market Header - Optimized for Mobile -->
@@ -82,7 +82,6 @@ import { useMarket } from '../composables/useMarket'
 import { useMarketPreloader } from '../composables/useMarketPreloader'
 import { useCategoryFilter } from '../composables/useCategoryFilter'
 import { config } from '@/lib/config'
-import { Button } from '@/components/ui/button'
 import { Avatar, AvatarImage, AvatarFallback } from '@/components/ui/avatar'
 import MarketSearchBar from '../components/MarketSearchBar.vue'
 import ProductGrid from '../components/ProductGrid.vue'
diff --git a/src/modules/market/views/StallView.vue b/src/modules/market/views/StallView.vue
index a061ac5..9a200a1 100644
--- a/src/modules/market/views/StallView.vue
+++ b/src/modules/market/views/StallView.vue
@@ -68,8 +68,9 @@
     <CategoryFilterBar
       v-if="stallCategories.length > 0"
       :categories="stallCategories"
-      :selected-categories="selectedCategories"
+      :selected-count="selectedCategories.length"
       :filter-mode="filterMode"
+      :product-count="productCount"
       title="Categories"
       @toggle-category="toggleCategoryFilter"
       @set-filter-mode="setFilterMode"
@@ -81,7 +82,7 @@
     <div class="mb-4 sm:mb-6 flex flex-col sm:flex-row gap-2 sm:gap-4">
       <div class="flex-1">
         <MarketSearchBar
-          :data="stallProducts"
+          :data="stallProducts as Product[]"
           :options="searchOptions"
           placeholder="Search products in this stall..."
           :show-enhancements="false"
@@ -203,11 +204,20 @@ const stallProducts = computed(() => {
 
 // Get unique categories for this stall
 const stallCategories = computed(() => {
-  const categories = new Set<string>()
+  const categoryCount = new Map<string, number>()
   stallProducts.value.forEach(product => {
-    product.categories?.forEach(cat => categories.add(cat))
+    product.categories?.forEach(cat => {
+      categoryCount.set(cat, (categoryCount.get(cat) || 0) + 1)
+    })
   })
-  return Array.from(categories).sort()
+
+  return Array.from(categoryCount.entries())
+    .sort((a, b) => a[0].localeCompare(b[0]))
+    .map(([category, count]) => ({
+      category,
+      count,
+      selected: selectedCategories.value.includes(category)
+    }))
 })
 
 // Product count