diff --git a/packages/app/next.config.js b/packages/app/next.config.js
index 0d7741b622..e0a89d3ff5 100644
--- a/packages/app/next.config.js
+++ b/packages/app/next.config.js
@@ -62,7 +62,7 @@ const nextConfig = {
   productionBrowserSourceMaps: true,
 
   webpack(config) {
-    config.optimization.chunkIds = 'named';
+    config.optimization.chunkIds = 'size';
     config.module.rules.push({
       test: /\.svg$/,
       type: 'asset',
diff --git a/packages/app/src/components/combo-box/combo-box.tsx b/packages/app/src/components/combo-box/combo-box.tsx
index cfcde33f48..e540d1ca46 100644
--- a/packages/app/src/components/combo-box/combo-box.tsx
+++ b/packages/app/src/components/combo-box/combo-box.tsx
@@ -21,6 +21,7 @@ type TProps<Option extends TOption> = {
   options: Option[];
   placeholder: string;
   onSelect: (option: Option) => void;
+  sorter?: (a: Option, b: Option) => number;
   selectedOption?: Option;
   shouldFocusInput?: boolean;
 };
diff --git a/packages/app/src/domain/layout/components/gm-combo-box.tsx b/packages/app/src/domain/layout/components/gm-combo-box.tsx
index 434ccea2b7..80a89b8493 100644
--- a/packages/app/src/domain/layout/components/gm-combo-box.tsx
+++ b/packages/app/src/domain/layout/components/gm-combo-box.tsx
@@ -16,6 +16,7 @@ export function GmComboBox(props: GmComboBoxProps) {
   const { commonTexts } = useIntl();
   const reverseRouter = useReverseRouter();
   const router = useRouter();
+  const expStr = new RegExp(["'s-"].join(' | '), 'g');
 
   return (
     <ComboBox
@@ -24,6 +25,7 @@ export function GmComboBox(props: GmComboBoxProps) {
       onSelect={({ gemcode }) => {
         router.push(typeof getLink === 'function' ? getLink(gemcode) : reverseRouter.gm.index(gemcode));
       }}
+      sorter={(a, b) => a.name.replace(expStr, '').localeCompare(b.name.replace(expStr, ''))}
       selectedOption={gmData.find((gm) => gm.gemcode === selectedGmCode)}
       shouldFocusInput={shouldFocusInput}
     />