diff --git a/README.md b/README.md
index 4abe2b2..b5ada8d 100644
--- a/README.md
+++ b/README.md
@@ -359,6 +359,24 @@ The `short_url_daily_stats` table stores pre-aggregated daily summaries per shor
 
 The `getCachedStats()` model method **automatically merges** data from both tables: historical days come from `short_url_daily_stats`, while today's data comes directly from `short_url_visits` — completely transparent to the dashboard.
 
+### Queue Worker vs. Synchronous Execution
+
+The plugin is designed to be highly reliable and performant regardless of whether your hosting environment runs a background queue worker. 
+
+#### 1. With a Queue Worker (Recommended)
+If your application runs a queue worker (e.g. via supervisor running `php artisan queue:work`), you should configure the **Queue Connection** in the **Settings** panel (or via `SHORT_URL_QUEUE` env variable) to your primary queue driver (like `redis` or `database`).
+- **Performance**: High-speed redirects are prioritized. Visitor clicks, Geo-IP lookups, GA4 hits, and Webhook dispatches are immediately deferred to background queue jobs (`TrackShortUrlVisitJob` and `SendWebhookJob`), keeping redirect response times under 20ms.
+- **Worker Configuration**: Ensure your queue listener is running:
+  ```bash
+  php artisan queue:work --queue=default
+  ```
+  *(If you customized the queue name in Settings, replace `default` with your custom queue name).*
+
+#### 2. Without a Queue Worker (Sync Driver Fallback)
+If you do not run background queue workers, set the **Queue Connection** to `sync`.
+- **Automatic Fallback**: The plugin dynamically executes all jobs synchronously on the request thread. The visitor is redirected as soon as the synchronous processes (log recording, webhook calls, etc.) complete.
+- **Fault Tolerance (Safety Nets)**: Webhook failures (timeouts, 500 errors) or database tracking glitches can happen. The plugin wraps all synchronous execution points in strict error boundaries (`try/catch`). **A failed tracking job or a slow/offline webhook will NEVER crash the visitor's redirect or programmatic REST API responses.** They are gracefully logged in the background.
+
 ### Queue-Based Counter Fallback
 
 When Redis is not available and counter buffering is enabled, the `IncrementVisitJob` is dispatched to the configured queue connection. This guarantees visit counts are not lost during cache evictions or restarts.
@@ -367,7 +385,12 @@ When Redis is not available and counter buffering is enabled, the `IncrementVisi
 
 ## Social Retargeting Pixels (new in v1.5.0)
 
-The **Marketing & API** tab in the short URL form lets you attach client-side tracking pixels to any link. When a visitor clicks a link that has pixels configured, instead of an instant 302 redirect the plugin serves a lightweight HTML interstitial page (styled with glassmorphism) for ~250 ms. During that time the browser executes the pixel scripts — capturing cookies and building ad audiences — then the visitor is forwarded to the destination URL.
+The **Marketing & API** tab in the short URL form lets you attach client-side tracking pixels to any link. When a visitor clicks a link that has pixels configured, instead of an instant 302 redirect the plugin serves a lightweight, premium HTML interstitial page.
+
+### The Interstitial Experience
+- **Premium Design**: Built using the exact same modern glassmorphic look as the password protection and warning interstitial pages. Supports dark mode automatically.
+- **Brand Customization**: Automatically renders the application logo and the **Site Name Override** (configured globally in Settings, falling back to `config('app.name')`) to ensure the transition page looks professional and trust-instilling.
+- **Micro-Animations & Smooth Redirect**: Displays a sleek animated loading spinner and a progress bar that smoothly fills from 0% to 100% in ~220-250ms. This short delay ensures browser execution time for the tracking scripts before performing a seamless `window.location.replace()` to the destination URL.
 
 This unlocks remarketing to people who clicked your links **even when redirecting to external domains** (e.g. booking.com, amazon.com) where you cannot install your own tracking code.
 
@@ -539,9 +562,14 @@ Webhooks allow external systems to receive real-time HTTP POST notifications whe
 
 Webhooks can be configured at two levels:
 
-**1. Per-link webhook** — Set a `Dedicated Webhook URL` in the **Marketing & API** tab of a specific short URL. Fires for every click on that link.
+**1. Per-link Webhook (Dedicated Webhook URL)**:
+*   **Where to configure**: Set the `Dedicated Webhook URL` in the **Marketing & API** tab of a specific short URL (or pass it via the `webhook_url` parameter in the REST API).
+*   **How it works**: When a visitor clicks the short URL, or when the link is programmatically created via the REST API, a webhook notification is sent directly to this URL.
+*   **Bypassing Global Filters**: Dedicated webhooks **always fire** for these events and are completely independent of the global *Monitored Webhook Events* settings. This is useful for third-party landing pages or integrations that need to track a specific link's traffic without routing all package events.
 
-**2. Global webhook** — Set a **Global Webhook URL** in **Settings → API & Webhooks → Global Webhook Configuration**. Fires for all links that don't have their own webhook URL, for the event types you select.
+**2. Global Webhook**:
+*   **Where to configure**: Set a **Global Webhook URL** in **Settings → API & Webhooks → Global Webhook Configuration**.
+*   **How it works**: Fires for all links that *do not* have their own Dedicated Webhook URL configured. It will only fire for the specific event types selected in the **Monitored Webhook Events** setting.
 
 ### Monitored Events
 
diff --git a/config/filament-short-url.php b/config/filament-short-url.php
index 3be1103..3997e85 100644
--- a/config/filament-short-url.php
+++ b/config/filament-short-url.php
@@ -14,6 +14,16 @@ return [
     */
     'route_prefix' => env('SHORT_URL_PREFIX', 's'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Site Name Override
+    |--------------------------------------------------------------------------
+    | The brand or site name displayed on the password prompt, redirect warnings,
+    | and pixel loading screens. Falls back to config('app.name') if empty.
+    |
+    */
+    'site_name' => env('SHORT_URL_SITE_NAME'),
+
     /*
     |--------------------------------------------------------------------------
     | Default Redirect Status Code
diff --git a/resources/lang/en/default.php b/resources/lang/en/default.php
index 01ddd1d..87e11ea 100644
--- a/resources/lang/en/default.php
+++ b/resources/lang/en/default.php
@@ -167,6 +167,8 @@ return [
     'settings_section_ga4' => 'GA4 Measurement Protocol',
     'settings_ga4_description' => 'Configure server-side Google Analytics 4 event tracking via the Measurement Protocol. Events are sent in the background without blocking the redirect.',
 
+    'settings_site_name' => 'Site Name Override',
+    'settings_site_name_helper' => 'Custom brand/site name displayed on redirect prompt screens. If empty, falls back to config("app.name").',
     'settings_route_prefix' => 'Route Prefix',
     'settings_route_prefix_helper' => 'URL segment before the short key, e.g. "/s/abc123". Change requires a config:clear.',
     'settings_key_length' => 'Auto-generated Key Length',
@@ -338,6 +340,8 @@ return [
     'warning_description' => 'You are leaving this secure portal and being redirected to an external target link. Please ensure you trust the address below:',
     'warning_btn_continue' => 'Continue to Destination',
     'warning_btn_back' => 'Go Back',
+    'pixel_loading_title' => 'Connecting...',
+    'pixel_loading_description' => 'Preparing your connection and forwarding you now.',
 
     // Marketing & API Tab
     'tab_marketing' => 'Marketing & API',
diff --git a/resources/lang/pl/default.php b/resources/lang/pl/default.php
index ddb1c76..8580b62 100644
--- a/resources/lang/pl/default.php
+++ b/resources/lang/pl/default.php
@@ -168,6 +168,8 @@ return [
     'settings_section_ga4' => 'GA4 Measurement Protocol',
     'settings_ga4_description' => 'Skonfiguruj serwerowe śledzenie zdarzeń GA4 przez Measurement Protocol. Zdarzenia są wysyłane w tle bez blokowania przekierowania.',
 
+    'settings_site_name' => 'Niestandardowa nazwa witryny',
+    'settings_site_name_helper' => 'Własna nazwa witryny/marki wyświetlana na ekranach przekierowań (monit o hasło, ostrzeżenia, piksele). W przypadku braku wartości, zostanie użyta nazwa z konfiguracji config("app.name").',
     'settings_route_prefix' => 'Prefiks trasy',
     'settings_route_prefix_helper' => 'Segment URL przed kluczem, np. "/s/abc123". Zmiana wymaga php artisan config:clear.',
     'settings_key_length' => 'Długość auto-generowanego klucza',
@@ -339,6 +341,8 @@ return [
     'warning_description' => 'Opuszczasz ten bezpieczny portal i zostajesz przekierowany na zewnętrzny link docelowy. Upewnij się, że ufasz poniższemu adresowi:',
     'warning_btn_continue' => 'Kontynuuj do celu',
     'warning_btn_back' => 'Wróć',
+    'pixel_loading_title' => 'Łączenie...',
+    'pixel_loading_description' => 'Przygotowujemy połączenie i za chwilę zostaniesz przekierowany.',
 
     // Marketing & API Tab
     'tab_marketing' => 'Marketing i API',
diff --git a/resources/views/password-prompt.blade.php b/resources/views/password-prompt.blade.php
index 650e8ae..02cd39b 100644
--- a/resources/views/password-prompt.blade.php
+++ b/resources/views/password-prompt.blade.php
@@ -37,7 +37,7 @@
     @php
         $logoPath = function_exists('setting') ? setting('logo_path') : null;
         $logoUrl = $logoPath ? \Illuminate\Support\Facades\Storage::disk('public')->url($logoPath) : null;
-        $siteName = config('app.name', 'Laravel');
+        $siteName = config('filament-short-url.site_name') ?: config('app.name', 'Laravel');
     @endphp
 
     {{-- Main Sign-in Box --}}
diff --git a/resources/views/pixel-loading.blade.php b/resources/views/pixel-loading.blade.php
index 7d8561f..372cac1 100644
--- a/resources/views/pixel-loading.blade.php
+++ b/resources/views/pixel-loading.blade.php
@@ -1,14 +1,37 @@
 <!DOCTYPE html>
-<html lang="en" class="h-full">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="h-full">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Connecting...</title>
-    
-    <!-- Premium Fonts -->
+    <title>{{ __('filament-short-url::default.pixel_loading_title') ?? 'Connecting...' }}</title>
+
+    <!-- Premium Google Fonts: Bricolage Grotesque -->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;600&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Bricolage+Grotesque:opsz,wght@12..96,200..800&display=swap" rel="stylesheet">
+
+    <!-- Self-contained Tailwind CSS CDN for maximum plug-and-play reliability -->
+    <script src="https://cdn.tailwindcss.com"></script>
+
+    <script>
+        tailwind.config = {
+            darkMode: 'class',
+            theme: {
+                extend: {
+                    fontFamily: {
+                        sans: ['Bricolage Grotesque', 'sans-serif'],
+                    },
+                }
+            }
+        }
+
+        // Detect system dark mode preferences
+        if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+            document.documentElement.classList.add('dark');
+        } else {
+            document.documentElement.classList.remove('dark');
+        }
+    </script>
 
     <!-- Meta / Facebook Pixel -->
     @if(!empty($pixelMetaId))
@@ -55,103 +78,56 @@
     </script>
     <noscript><img height="1" width="1" style="display:none;" alt="" src="https://px.ads.linkedin.com/collect/?pid={{ $pixelLinkedinId }}&fmt=gif" /></noscript>
     @endif
-
-    <!-- Premium Styling -->
-    <style>
-        body {
-            background: linear-gradient(135deg, #0f172a 0%, #1e1b4b 100%);
-            color: #f1f5f9;
-            font-family: 'Outfit', -apple-system, sans-serif;
-            margin: 0;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            height: 100vh;
-            overflow: hidden;
-        }
-
-        .container {
-            text-align: center;
-            padding: 2.5rem;
-            border-radius: 1.5rem;
-            background: rgba(255, 255, 255, 0.03);
-            backdrop-filter: blur(16px);
-            -webkit-backdrop-filter: blur(16px);
-            border: 1px solid rgba(255, 255, 255, 0.08);
-            box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
-            max-width: 400px;
-            width: 90%;
-            animation: fadeIn 0.6s ease-out;
-        }
-
-        .spinner {
-            position: relative;
-            width: 72px;
-            height: 72px;
-            margin: 0 auto 2rem;
-        }
-
-        .spinner-ring {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-            border: 4px solid transparent;
-            border-top-color: #6366f1;
-            border-radius: 50%;
-            animation: spin 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
-        }
-
-        .spinner-ring:nth-child(2) {
-            animation-delay: -0.3s;
-            border-top-color: #a855f7;
-        }
-
-        .spinner-ring:nth-child(3) {
-            animation-delay: -0.6s;
-            border-top-color: #ec4899;
-        }
-
-        h1 {
-            font-size: 1.5rem;
-            font-weight: 600;
-            margin: 0 0 0.5rem;
-            background: linear-gradient(to right, #818cf8, #f472b6);
-            -webkit-background-clip: text;
-            -webkit-text-fill-color: transparent;
-            letter-spacing: -0.025em;
-        }
-
-        p {
-            font-size: 0.95rem;
-            color: #94a3b8;
-            margin: 0;
-            font-weight: 300;
-        }
-
-        @keyframes spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
-        }
-
-        @keyframes fadeIn {
-            from { opacity: 0; transform: translateY(10px); }
-            to { opacity: 1; transform: translateY(0); }
-        }
-    </style>
 </head>
-<body>
-    <div class="container">
-        <div class="spinner">
-            <div class="spinner-ring"></div>
-            <div class="spinner-ring"></div>
-            <div class="spinner-ring"></div>
+<body class="bg-[#FCFCFC] dark:bg-[#0C0C0C] min-h-screen flex flex-col justify-between items-center py-10 px-6 font-sans antialiased">
+    @php
+        $logoPath = function_exists('setting') ? setting('logo_path') : null;
+        $logoUrl = $logoPath ? \Illuminate\Support\Facades\Storage::disk('public')->url($logoPath) : null;
+        $siteName = config('filament-short-url.site_name') ?: config('app.name', 'Laravel');
+    @endphp
+
+    {{-- Main card --}}
+    <div class="w-full max-w-[360px] flex flex-col items-center gap-6 my-auto">
+        <div class="flex flex-col items-center text-center pb-2 select-none w-full">
+            @if ($logoUrl)
+                <img src="{{ $logoUrl }}" alt="{{ $siteName }}" class="h-[60px] w-auto object-contain mb-4" />
+            @else
+                <span class="text-3xl font-extrabold tracking-tight text-neutral-900 dark:text-white mb-3">{{ $siteName }}</span>
+            @endif
+
+            {{-- Animated spinner --}}
+            <div class="my-5 flex items-center justify-center gap-1.5" aria-hidden="true">
+                <span class="block w-2.5 h-2.5 rounded-full bg-neutral-300 dark:bg-neutral-600 animate-bounce [animation-delay:-0.3s]"></span>
+                <span class="block w-2.5 h-2.5 rounded-full bg-neutral-400 dark:bg-neutral-500 animate-bounce [animation-delay:-0.15s]"></span>
+                <span class="block w-2.5 h-2.5 rounded-full bg-neutral-500 dark:bg-neutral-400 animate-bounce"></span>
+            </div>
+
+            <p class="text-xl font-medium text-neutral-900 dark:text-white mt-2">
+                {{ __('filament-short-url::default.pixel_loading_title') ?? 'Connecting...' }}
+            </p>
+            <p class="text-sm text-neutral-400 dark:text-neutral-500 mt-1">
+                {{ __('filament-short-url::default.pixel_loading_description') ?? 'Preparing your connection and forwarding you now.' }}
+            </p>
+        </div>
+
+        {{-- Progress bar --}}
+        <div class="w-full h-1 rounded-full bg-neutral-200 dark:bg-neutral-800 overflow-hidden">
+            <div id="pixel-progress" class="h-full w-0 rounded-full bg-neutral-900 dark:bg-white transition-all ease-linear" style="transition-duration: 220ms;"></div>
         </div>
-        <h1>Connecting Safely</h1>
-        <p>Securing connection & forwarding you now...</p>
     </div>
 
-    <!-- Async non-blocking redirect -->
+    {{-- Footer --}}
+    <div class="flex flex-col items-center gap-2 mt-auto select-none">
+        <span class="text-xs font-medium text-neutral-400 dark:text-neutral-600">© {{ date('Y') }} {{ $siteName }} Inc. All rights reserved.</span>
+    </div>
+
+    {{-- Redirect after pixels fire --}}
     <script>
+        // Animate the progress bar to full in sync with the redirect delay
+        requestAnimationFrame(function() {
+            document.getElementById('pixel-progress').style.width = '100%';
+        });
+
         setTimeout(function() {
             window.location.replace("{!! addslashes($destination) !!}");
         }, 250);
diff --git a/resources/views/warning.blade.php b/resources/views/warning.blade.php
index f976511..cb8ea8c 100644
--- a/resources/views/warning.blade.php
+++ b/resources/views/warning.blade.php
@@ -37,7 +37,7 @@
     @php
         $logoPath = function_exists('setting') ? setting('logo_path') : null;
         $logoUrl = $logoPath ? \Illuminate\Support\Facades\Storage::disk('public')->url($logoPath) : null;
-        $siteName = config('app.name', 'Laravel');
+        $siteName = config('filament-short-url.site_name') ?: config('app.name', 'Laravel');
     @endphp
 
     {{-- Main Warning Box --}}
diff --git a/routes/web.php b/routes/web.php
index f502a40..f2308a0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,8 @@
 <?php
 
+use Bjanczak\FilamentShortUrl\Http\Controllers\ShortUrlApiController;
 use Bjanczak\FilamentShortUrl\Http\Controllers\ShortUrlRedirectController;
+use Bjanczak\FilamentShortUrl\Http\Middleware\AuthenticateShortUrlApi;
 use Illuminate\Support\Facades\Route;
 
 Route::match(
@@ -13,9 +15,9 @@ Route::match(
     ->middleware(config('filament-short-url.middleware', ['web', 'throttle:120,1']));
 
 Route::prefix('api/short-url')
-    ->middleware([\Bjanczak\FilamentShortUrl\Http\Middleware\AuthenticateShortUrlApi::class])
+    ->middleware([AuthenticateShortUrlApi::class])
     ->group(function () {
-        Route::get('links', [\Bjanczak\FilamentShortUrl\Http\Controllers\ShortUrlApiController::class, 'index']);
-        Route::post('links', [\Bjanczak\FilamentShortUrl\Http\Controllers\ShortUrlApiController::class, 'store']);
-        Route::delete('links/{id}', [\Bjanczak\FilamentShortUrl\Http\Controllers\ShortUrlApiController::class, 'destroy']);
+        Route::get('links', [ShortUrlApiController::class, 'index']);
+        Route::post('links', [ShortUrlApiController::class, 'store']);
+        Route::delete('links/{id}', [ShortUrlApiController::class, 'destroy']);
     });
diff --git a/src/Console/Commands/AggregateAndPruneVisitsCommand.php b/src/Console/Commands/AggregateAndPruneVisitsCommand.php
index f636a59..54daa2b 100644
--- a/src/Console/Commands/AggregateAndPruneVisitsCommand.php
+++ b/src/Console/Commands/AggregateAndPruneVisitsCommand.php
@@ -42,8 +42,10 @@ class AggregateAndPruneVisitsCommand extends Command
                 // Accumulate stats per short_url_id using chunked reads — avoids loading
                 // potentially millions of rows into PHP memory at once.
                 $statsByUrl = [];
+                $nextDate = Carbon::parse($date)->addDay()->toDateString();
 
-                ShortUrlVisit::whereBetween('visited_at', [$date.' 00:00:00', $date.' 23:59:59'])
+                ShortUrlVisit::where('visited_at', '>=', $date.' 00:00:00')
+                    ->where('visited_at', '<', $nextDate.' 00:00:00')
                     ->chunk(1000, function ($chunk) use (&$statsByUrl): void {
                         foreach ($chunk as $visit) {
                             $urlId = $visit->short_url_id;
diff --git a/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php b/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
index 7858bff..12bc90f 100644
--- a/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
+++ b/src/Filament/Resources/ShortUrlResource/Pages/ShortUrlSettingsPage.php
@@ -6,6 +6,7 @@ use Bjanczak\FilamentShortUrl\Filament\Resources\ShortUrlResource;
 use Bjanczak\FilamentShortUrl\Services\ShortUrlSettingsManager;
 use Filament\Actions\Action;
 use Filament\Forms\Components\ColorPicker;
+use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -78,6 +79,7 @@ class ShortUrlSettingsPage extends Page implements HasForms
             'webhook_events' => $mgr->get('webhook_events', ['visited']),
             'api_keys' => $mgr->get('api_keys', []),
             'api_enabled' => $mgr->get('api_enabled', false),
+            'site_name' => $mgr->get('site_name'),
         ]);
     }
 
@@ -96,6 +98,13 @@ class ShortUrlSettingsPage extends Page implements HasForms
                                 Section::make(__('filament-short-url::default.settings_section_routing'))
                                     ->columns(2)
                                     ->schema([
+                                        TextInput::make('site_name')
+                                            ->label(__('filament-short-url::default.settings_site_name'))
+                                            ->helperText(__('filament-short-url::default.settings_site_name_helper'))
+                                            ->nullable()
+                                            ->maxLength(100)
+                                            ->columnSpanFull(),
+
                                         TextInput::make('route_prefix')
                                             ->label(__('filament-short-url::default.settings_route_prefix'))
                                             ->helperText(__('filament-short-url::default.settings_route_prefix_helper'))
@@ -582,7 +591,7 @@ class ShortUrlSettingsPage extends Page implements HasForms
                                 Section::make(__('filament-short-url::default.settings_section_api_keys'))
                                     ->description(__('filament-short-url::default.settings_api_keys_description'))
                                     ->schema([
-                                        \Filament\Forms\Components\Repeater::make('api_keys')
+                                        Repeater::make('api_keys')
                                             ->label(__('filament-short-url::default.settings_api_keys'))
                                             ->schema([
                                                 TextInput::make('name')
@@ -609,6 +618,7 @@ class ShortUrlSettingsPage extends Page implements HasForms
     public function save(): void
     {
         $data = $this->form->getState();
+        file_put_contents('/tmp/debug.txt', print_r($data, true));
 
         app(ShortUrlSettingsManager::class)->set($data);
 
diff --git a/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php b/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
index c3cb944..d3f4cd1 100644
--- a/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
+++ b/src/Filament/Resources/ShortUrlResource/Schemas/ShortUrlForm.php
@@ -108,7 +108,7 @@ class ShortUrlForm
                         ->required(),
                 ])->columns(2),
 
-                 Section::make(__('filament-short-url::default.form_section_options'))->schema([
+                Section::make(__('filament-short-url::default.form_section_options'))->schema([
                     Toggle::make('is_enabled')
                         ->label(__('filament-short-url::default.status'))
                         ->default(true)
@@ -438,8 +438,10 @@ class ShortUrlForm
                                         $countries = __('filament-short-url::countries');
                                         if (is_array($countries)) {
                                             asort($countries, SORT_LOCALE_STRING);
+
                                             return $countries;
                                         }
+
                                         return [];
                                     })
                                     ->searchable()
diff --git a/src/Http/Controllers/ShortUrlApiController.php b/src/Http/Controllers/ShortUrlApiController.php
index dc06871..e661fd1 100644
--- a/src/Http/Controllers/ShortUrlApiController.php
+++ b/src/Http/Controllers/ShortUrlApiController.php
@@ -8,6 +8,7 @@ use Bjanczak\FilamentShortUrl\Services\ShortUrlService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Log;
 
 class ShortUrlApiController extends Controller
 {
@@ -117,21 +118,28 @@ class ShortUrlApiController extends Controller
         $globalUrl = config('filament-short-url.global_webhook_url');
         $events = config('filament-short-url.webhook_events', []);
 
-        if (empty($targetUrl) && !empty($globalUrl) && in_array('created', $events)) {
+        if (empty($targetUrl) && ! empty($globalUrl) && in_array('created', $events)) {
             $targetUrl = $globalUrl;
         }
 
-        if (!empty($targetUrl)) {
-            $connection = config('filament-short-url.queue_connection', 'sync');
-            dispatch(new SendWebhookJob(
-                url: $targetUrl,
-                event: 'created',
-                payload: [
-                    'event' => 'created',
-                    'timestamp' => now()->toIso8601String(),
-                    'short_url' => $this->transformLink($shortUrl),
-                ]
-            )->onConnection($connection ?: 'sync'));
+        if (! empty($targetUrl)) {
+            try {
+                $connection = config('filament-short-url.queue_connection', 'sync');
+                dispatch(new SendWebhookJob(
+                    url: $targetUrl,
+                    event: 'created',
+                    payload: [
+                        'event' => 'created',
+                        'timestamp' => now()->toIso8601String(),
+                        'short_url' => $this->transformLink($shortUrl),
+                    ]
+                )->onConnection($connection ?: 'sync'));
+            } catch (\Throwable $e) {
+                Log::error('[FilamentShortUrl] Created webhook dispatch failed', [
+                    'url_key' => $shortUrl->url_key,
+                    'error' => $e->getMessage(),
+                ]);
+            }
         }
     }
 }
diff --git a/src/Http/Controllers/ShortUrlRedirectController.php b/src/Http/Controllers/ShortUrlRedirectController.php
index f5ac180..19154d3 100644
--- a/src/Http/Controllers/ShortUrlRedirectController.php
+++ b/src/Http/Controllers/ShortUrlRedirectController.php
@@ -8,6 +8,7 @@ use Bjanczak\FilamentShortUrl\Services\ClientIpExtractor;
 use Bjanczak\FilamentShortUrl\Services\ShortUrlService;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\MessageBag;
 use Symfony\Component\HttpFoundation\Response;
@@ -100,29 +101,37 @@ class ShortUrlRedirectController extends Controller
 
         // 5. Track Visit
         if ($shortUrl->track_visits) {
-            $connection = config('filament-short-url.queue_connection', 'sync');
-            $ipAddress = ClientIpExtractor::getIp($request);
-            $countryCode = ClientIpExtractor::getCountryCode($request);
-            $city = ClientIpExtractor::getCity($request);
+            try {
+                $connection = config('filament-short-url.queue_connection', 'sync');
+                $ipAddress = ClientIpExtractor::getIp($request);
+                $countryCode = ClientIpExtractor::getCountryCode($request);
+                $city = ClientIpExtractor::getCity($request);
 
-            $job = new TrackShortUrlVisitJob(
-                shortUrl: $shortUrl,
-                ipAddress: $ipAddress,
-                userAgent: $request->userAgent() ?? '',
-                refererUrl: $request->header('Referer'),
-                countryCode: $countryCode,
-                city: $city,
-                utmSource: $request->query('utm_source'),
-                utmMedium: $request->query('utm_medium'),
-                utmCampaign: $request->query('utm_campaign'),
-                utmTerm: $request->query('utm_term'),
-                utmContent: $request->query('utm_content'),
-            );
+                $job = new TrackShortUrlVisitJob(
+                    shortUrl: $shortUrl,
+                    ipAddress: $ipAddress,
+                    userAgent: $request->userAgent() ?? '',
+                    refererUrl: $request->header('Referer'),
+                    countryCode: $countryCode,
+                    city: $city,
+                    utmSource: $request->query('utm_source'),
+                    utmMedium: $request->query('utm_medium'),
+                    utmCampaign: $request->query('utm_campaign'),
+                    utmTerm: $request->query('utm_term'),
+                    utmContent: $request->query('utm_content'),
+                );
 
-            if ($connection) {
-                dispatch($job->onConnection($connection));
-            } else {
-                dispatch($job->onConnection('sync'));
+                if ($connection) {
+                    dispatch($job->onConnection($connection));
+                } else {
+                    dispatch($job->onConnection('sync'));
+                }
+            } catch (\Throwable $e) {
+                // Never let tracking failures block the redirection of the user!
+                Log::error('[FilamentShortUrl] Redirect tracking failed', [
+                    'url_key' => $key,
+                    'error' => $e->getMessage(),
+                ]);
             }
         }
 
diff --git a/src/Http/Middleware/AuthenticateShortUrlApi.php b/src/Http/Middleware/AuthenticateShortUrlApi.php
index 0f6782b..a520620 100644
--- a/src/Http/Middleware/AuthenticateShortUrlApi.php
+++ b/src/Http/Middleware/AuthenticateShortUrlApi.php
@@ -22,7 +22,7 @@ class AuthenticateShortUrlApi
 
         $apiKey = $request->header('X-Api-Key');
 
-        if (!$apiKey && $auth = $request->header('Authorization')) {
+        if (! $apiKey && $auth = $request->header('Authorization')) {
             if (str_starts_with(strtolower($auth), 'bearer ')) {
                 $apiKey = substr($auth, 7);
             }
@@ -45,7 +45,7 @@ class AuthenticateShortUrlApi
             }
         }
 
-        if (!$valid) {
+        if (! $valid) {
             return response()->json([
                 'error' => 'Unauthorized. Invalid or inactive API Key.',
             ], 401);
diff --git a/src/Jobs/SendWebhookJob.php b/src/Jobs/SendWebhookJob.php
index de7b362..ee2ba61 100644
--- a/src/Jobs/SendWebhookJob.php
+++ b/src/Jobs/SendWebhookJob.php
@@ -48,17 +48,17 @@ class SendWebhookJob implements ShouldQueue
                 ->post($this->url, $this->payload);
 
             if ($response->failed()) {
-                Log::warning("[FilamentShortUrl] Webhook delivery returned client/server error", [
+                Log::warning('[FilamentShortUrl] Webhook delivery returned client/server error', [
                     'url' => $this->url,
                     'event' => $this->event,
                     'status' => $response->status(),
                 ]);
 
                 // Throw exception to trigger queue retry
-                throw new \RuntimeException("Webhook failed with status " . $response->status());
+                throw new \RuntimeException('Webhook failed with status '.$response->status());
             }
         } catch (\Throwable $e) {
-            Log::warning("[FilamentShortUrl] Webhook delivery failed", [
+            Log::warning('[FilamentShortUrl] Webhook delivery failed', [
                 'url' => $this->url,
                 'event' => $this->event,
                 'error' => $e->getMessage(),
diff --git a/src/Jobs/TrackShortUrlVisitJob.php b/src/Jobs/TrackShortUrlVisitJob.php
index bcdf4e8..a7b6838 100644
--- a/src/Jobs/TrackShortUrlVisitJob.php
+++ b/src/Jobs/TrackShortUrlVisitJob.php
@@ -100,41 +100,48 @@ class TrackShortUrlVisitJob implements ShouldQueue
         }
 
         if (! empty($targetUrl)) {
-            dispatch(new \Bjanczak\FilamentShortUrl\Jobs\SendWebhookJob(
-                url: $targetUrl,
-                event: 'visited',
-                payload: [
-                    'event' => 'visited',
-                    'timestamp' => now()->toIso8601String(),
-                    'short_url' => [
-                        'id' => $shortUrl->id,
-                        'destination_url' => $shortUrl->destination_url,
-                        'url_key' => $shortUrl->url_key,
-                        'short_url' => $shortUrl->getShortUrl(),
-                        'total_visits' => (int) $shortUrl->getRealTimeTotalVisits(),
-                        'unique_visits' => (int) $shortUrl->unique_visits,
-                    ],
-                    'visit' => [
-                        'id' => $visit->id,
-                        'visited_at' => $visit->visited_at->toIso8601String(),
-                        'device_type' => $visit->device_type,
-                        'browser' => $visit->browser,
-                        'browser_version' => $visit->browser_version,
-                        'operating_system' => $visit->operating_system,
-                        'operating_system_version' => $visit->operating_system_version,
-                        'country' => $visit->country,
-                        'country_code' => $visit->country_code,
-                        'city' => $visit->city,
-                        'referer_url' => $visit->referer_url,
-                        'referer_host' => $visit->referer_host,
-                        'utm_source' => $visit->utm_source,
-                        'utm_medium' => $visit->utm_medium,
-                        'utm_campaign' => $visit->utm_campaign,
-                        'utm_term' => $visit->utm_term,
-                        'utm_content' => $visit->utm_content,
-                    ],
-                ]
-            )->onConnection($this->connection ?: 'sync'));
+            try {
+                dispatch(new SendWebhookJob(
+                    url: $targetUrl,
+                    event: 'visited',
+                    payload: [
+                        'event' => 'visited',
+                        'timestamp' => now()->toIso8601String(),
+                        'short_url' => [
+                            'id' => $shortUrl->id,
+                            'destination_url' => $shortUrl->destination_url,
+                            'url_key' => $shortUrl->url_key,
+                            'short_url' => $shortUrl->getShortUrl(),
+                            'total_visits' => (int) $shortUrl->getRealTimeTotalVisits(),
+                            'unique_visits' => (int) $shortUrl->unique_visits,
+                        ],
+                        'visit' => [
+                            'id' => $visit->id,
+                            'visited_at' => $visit->visited_at->toIso8601String(),
+                            'device_type' => $visit->device_type,
+                            'browser' => $visit->browser,
+                            'browser_version' => $visit->browser_version,
+                            'operating_system' => $visit->operating_system,
+                            'operating_system_version' => $visit->operating_system_version,
+                            'country' => $visit->country,
+                            'country_code' => $visit->country_code,
+                            'city' => $visit->city,
+                            'referer_url' => $visit->referer_url,
+                            'referer_host' => $visit->referer_host,
+                            'utm_source' => $visit->utm_source,
+                            'utm_medium' => $visit->utm_medium,
+                            'utm_campaign' => $visit->utm_campaign,
+                            'utm_term' => $visit->utm_term,
+                            'utm_content' => $visit->utm_content,
+                        ],
+                    ]
+                )->onConnection($this->connection ?: 'sync'));
+            } catch (\Throwable $e) {
+                Log::error('[FilamentShortUrl] Visited webhook dispatch failed', [
+                    'url_key' => $shortUrl->url_key,
+                    'error' => $e->getMessage(),
+                ]);
+            }
         }
 
         // Optional GA4 Measurement Protocol integration
diff --git a/src/Services/ShortUrlService.php b/src/Services/ShortUrlService.php
index 42fb7c2..5b3399e 100644
--- a/src/Services/ShortUrlService.php
+++ b/src/Services/ShortUrlService.php
@@ -107,13 +107,15 @@ class ShortUrlService
      */
     public function resolveRedirectUrl(ShortUrl $shortUrl, Request $request): string
     {
-        $destination = $shortUrl->destination_url;
+        $destination = $shortUrl->resolveDestinationUrl($request);
 
         if (! $shortUrl->forward_query_params) {
             return $destination;
         }
 
         $queryParams = $request->query();
+        // Remove routing/auth parameters so they don't leak to destination
+        unset($queryParams['confirmed'], $queryParams['password']);
 
         if (empty($queryParams)) {
             return $destination;
diff --git a/src/Services/ShortUrlSettingsManager.php b/src/Services/ShortUrlSettingsManager.php
index 9e6867f..7206a47 100644
--- a/src/Services/ShortUrlSettingsManager.php
+++ b/src/Services/ShortUrlSettingsManager.php
@@ -80,6 +80,7 @@ class ShortUrlSettingsManager
             'webhook_events' => ['visited'],
             'api_keys' => [],
             'api_enabled' => false,
+            'site_name' => config('filament-short-url.site_name'),
         ], $stored);
 
         return $this->cache;
@@ -150,6 +151,7 @@ class ShortUrlSettingsManager
             'webhook_events',
             'api_keys',
             'api_enabled',
+            'site_name',
         ];
 
         $filtered = array_intersect_key($data, array_flip($keys));
@@ -303,6 +305,7 @@ class ShortUrlSettingsManager
             'filament-short-url.global_webhook_url' => $settings['global_webhook_url'] ?? null,
             'filament-short-url.webhook_events' => $settings['webhook_events'] ?? ['visited'],
             'filament-short-url.api_enabled' => (bool) ($settings['api_enabled'] ?? false),
+            'filament-short-url.site_name' => $settings['site_name'] ?? null,
         ]);
     }
 }