diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index f7e65edf6..020c60fd5 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -54,7 +54,7 @@ export default {
     return [
       await evolution(commandGroup, period, player, tankId),
       primaryButton(path, 'Refresh'),
-      linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
+      // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
         `https://www.blitzstars.com/player/${player.server}/${nickname}${
           commandGroup === 'tank' ? `/tank/${tankId!}` : ''
diff --git a/src/commands/statsfull.tsx b/src/commands/statsfull.tsx
index 023466552..2eedd49b5 100644
--- a/src/commands/statsfull.tsx
+++ b/src/commands/statsfull.tsx
@@ -53,7 +53,7 @@ export default {
     return [
       await statsfull(commandGroup, period, player, tankId),
       primaryButton(path, 'Refresh'),
-      linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
+      // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
         `https://www.blitzstars.com/player/${player.server}/${nickname}`,
         'BlitzStars',
diff --git a/src/commands/today.tsx b/src/commands/today.tsx
index 324c92b77..86587df48 100644
--- a/src/commands/today.tsx
+++ b/src/commands/today.tsx
@@ -1,5 +1,4 @@
 import { SlashCommandBuilder } from 'discord.js';
-import { CYCLIC_API } from '../constants/cyclic.js';
 import getWargamingResponse from '../core/blitz/getWargamingResponse.js';
 import addUsernameChoices from '../core/discord/addUsernameChoices.js';
 import autocompleteUsername from '../core/discord/autocompleteUsername.js';
@@ -35,7 +34,7 @@ export default {
     return [
       await today(player),
       primaryButton(path, 'Refresh'),
-      linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
+      // linkButton(`${CYCLIC_API}/${path}`, 'Embed'),
       linkButton(
         `https://www.blitzstars.com/player/${player.server}/${nickname}`,
         'BlitzStars',
diff --git a/src/components/AllStatsOverview/index.tsx b/src/components/AllStatsOverview/index.tsx
index 0571520e7..3a2834d73 100644
--- a/src/components/AllStatsOverview/index.tsx
+++ b/src/components/AllStatsOverview/index.tsx
@@ -19,8 +19,7 @@ export default function AllStatsOverview({
       style={{
         display: 'flex',
         gap: -64,
-        // alignItems: 'center',
-        // justifyContent: 'center',
+        width: '100%',
       }}
     >
       <div
diff --git a/src/core/express/resolvePlayerFromRequest.ts b/src/core/express/resolvePlayerFromRequest.ts
index e012942c4..2fe5bd578 100644
--- a/src/core/express/resolvePlayerFromRequest.ts
+++ b/src/core/express/resolvePlayerFromRequest.ts
@@ -3,5 +3,5 @@ import { CYCLIC_API } from '../../constants/cyclic.js';
 import resolvePlayerFromURL from './resolvePlayerFromURL.js';
 
 export default function resolvePlayerFromRequest(request: Request) {
-  return resolvePlayerFromURL(`${CYCLIC_API}${request.path}`);
+  return resolvePlayerFromURL(`${CYCLIC_API}${request.originalUrl}`);
 }
diff --git a/src/renderers/stats.tsx b/src/renderers/stats.tsx
index c2d6401fa..60f40e567 100644
--- a/src/renderers/stats.tsx
+++ b/src/renderers/stats.tsx
@@ -29,6 +29,7 @@ export default async function stats<Type extends StatType>(
   { start, end, statsName }: ResolvedPeriod,
   { server, id }: ResolvedPlayer,
   tankId: Type extends 'tank' ? number : null,
+  naked = false,
 ) {
   let nameDiscriminator: string | undefined;
   let image: string | undefined;
@@ -123,8 +124,13 @@ export default async function stats<Type extends StatType>(
   const accountInfo = await getWargamingResponse<AccountInfo>(
     `https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
   );
+  const overview = (
+    <AllStatsOverview stats={stats} supplementaryStats={supplementaryStats} />
+  );
 
-  return (
+  return naked ? (
+    overview
+  ) : (
     <Wrapper>
       <TitleBar
         name={accountInfo[id].nickname}
@@ -136,12 +142,7 @@ export default async function stats<Type extends StatType>(
       />
 
       {stats.battles === 0 && <NoData type={NoDataType.BattlesInPeriod} />}
-      {stats.battles > 0 && (
-        <AllStatsOverview
-          stats={stats}
-          supplementaryStats={supplementaryStats}
-        />
-      )}
+      {stats.battles > 0 && overview}
 
       <PoweredBy type={PoweredByType.BlitzStars} />
     </Wrapper>
diff --git a/src/routers/stats.tsx b/src/routers/stats.tsx
index 861933cfe..dc8c5c661 100644
--- a/src/routers/stats.tsx
+++ b/src/routers/stats.tsx
@@ -1,23 +1,24 @@
 import resolvePeriodFromRequest from '../core/express/resolvePeriodFromRequest.js';
 import resolvePlayerFromRequest from '../core/express/resolvePlayerFromRequest.js';
-import statsfull, { StatType } from '../renderers/statsfull.js';
+import stats, { StatType } from '../renderers/stats.js';
 import { RouterRegistry } from '../server.js';
 
 export default {
   route: '/stats/:type/:period',
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
 
   async handler(req) {
     const type = req.params.type as StatType;
     const period = resolvePeriodFromRequest(req);
     const player = resolvePlayerFromRequest(req);
 
-    return await statsfull(
+    return await stats(
       type,
       period,
       player,
-      parseInt(req.query.tank as string),
+      parseInt(req.query.tankId as string),
+      true,
     );
   },
 } satisfies RouterRegistry;