diff --git a/packages/app/next.config.js b/packages/app/next.config.js
index dc5dce6028..a142541ae5 100644
--- a/packages/app/next.config.js
+++ b/packages/app/next.config.js
@@ -5,12 +5,7 @@ const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
 });
-const withTranspileModules = require('next-transpile-modules')([
-  'd3-geo',
-  'd3-array',
-  'globby',
-  'internmap',
-]);
+const withTranspileModules = require('next-transpile-modules')(['d3-geo', 'd3-array', 'globby', 'internmap']);
 const path = require('path');
 const { DuplicatesPlugin } = require('inspectpack/plugin');
 
@@ -59,7 +54,7 @@ const nextConfig = {
   productionBrowserSourceMaps: true,
 
   webpack(config) {
-    config.optimization.chunkIds = 'size';
+    config.optimization.chunkIds = 'named';
     config.module.rules.push({
       test: /\.svg$/,
       type: 'asset',
@@ -83,15 +78,9 @@ const nextConfig = {
       ['d3-array', '../../node_modules/d3-array'],
       ['d3-color', '../../node_modules/d3-scale/node_modules/d3-color'],
       ['d3-geo', '../../node_modules/d3-geo'],
-      [
-        'd3-interpolate',
-        '../../node_modules/d3-scale/node_modules/d3-interpolate',
-      ],
+      ['d3-interpolate', '../../node_modules/d3-scale/node_modules/d3-interpolate'],
       ['react-is', '../../node_modules/react-is'],
-      [
-        'unist-util-visit-parents',
-        '../../node_modules/unist-util-visit-parents',
-      ],
+      ['unist-util-visit-parents', '../../node_modules/unist-util-visit-parents'],
     ];
 
     duplicatePackageResolves.forEach(([packageName, resolvedPath]) => {
diff --git a/packages/app/src/components/combo-box/combo-box.tsx b/packages/app/src/components/combo-box/combo-box.tsx
index cae584b3b4..58c8985354 100644
--- a/packages/app/src/components/combo-box/combo-box.tsx
+++ b/packages/app/src/components/combo-box/combo-box.tsx
@@ -1,10 +1,4 @@
-import {
-  Combobox,
-  ComboboxInput,
-  ComboboxList,
-  ComboboxOption,
-  ComboboxPopover,
-} from '@reach/combobox';
+import { Combobox, ComboboxInput, ComboboxList, ComboboxOption, ComboboxPopover } from '@reach/combobox';
 import css from '@styled-system/css';
 import { matchSorter } from 'match-sorter';
 import { useRouter } from 'next/router';
@@ -26,7 +20,6 @@ type TProps<Option extends TOption> = {
   options: Option[];
   placeholder: string;
   onSelect: (option: Option) => void;
-  sorter?: (a: Option, b: Option) => number;
   selectedOption?: Option;
 };
 
@@ -69,15 +62,10 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
     if (event.isDefaultPrevented() || !container) return;
 
     window.requestAnimationFrame(() => {
-      const element: HTMLInputElement | null = container.querySelector(
-        '[aria-selected=true]'
-      );
+      const element: HTMLInputElement | null = container.querySelector('[aria-selected=true]');
       if (element) {
         const top = element.offsetTop - container.scrollTop; // Calculate the space between active element and top of the list
-        const bottom =
-          container.scrollTop +
-          container.clientHeight -
-          (element.offsetTop + element.clientHeight); // Calculate the space between active element and bottom of the list
+        const bottom = container.scrollTop + container.clientHeight - (element.offsetTop + element.clientHeight); // Calculate the space between active element and bottom of the list
 
         if (bottom < 0) container.scrollTop -= bottom;
         if (top < 0) container.scrollTop += top;
@@ -85,9 +73,7 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
     });
   };
 
-  const handleInputChange = (
-    event: React.ChangeEvent<HTMLInputElement>
-  ): void => {
+  const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
     setInputValue(event.target.value);
   };
 
@@ -96,14 +82,9 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
       return;
     }
 
-    const option = options.find(
-      (option) => option.name === name || option.displayName === name
-    );
+    const option = options.find((option) => option.name === name || option.displayName === name);
 
-    assert(
-      option,
-      `[${ComboBox.name}:${handleSelect.name}] Failed to find option for name ${name}`
-    );
+    assert(option, `[${ComboBox.name}:${handleSelect.name}] Failed to find option for name ${name}`);
 
     props.onSelect(option);
 
@@ -124,21 +105,12 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
   return (
     <Box role="search" css={css({ '[data-reach-combobox]': { px: 3, py: 4 } })}>
       <Combobox openOnFocus onSelect={handleSelect}>
-        <ComboboxInput
-          ref={inputRef}
-          onChange={handleInputChange}
-          onKeyDown={handleKeyDown}
-          placeholder={placeholder}
-        />
+        <ComboboxInput ref={inputRef} onChange={handleInputChange} onKeyDown={handleKeyDown} placeholder={placeholder} />
         <ComboboxPopover>
           {results.length > 0 ? (
             <ComboboxList ref={containerRef}>
               {results.map((option, index) => (
-                <StyledComboboxOption
-                  key={`${index}-${option.name}`}
-                  value={option.displayName || option.name}
-                  $isSelectedOption={selectedOption?.name === option.name}
-                />
+                <StyledComboboxOption key={`${index}-${option.name}`} value={option.displayName || option.name} $isSelectedOption={selectedOption?.name === option.name} />
               ))}
             </ComboboxList>
           ) : (
@@ -151,10 +123,7 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
   );
 };
 
-const useSearchedAndSortedOptions = <Option extends TOption>(
-  term: string,
-  options: Option[]
-): Option[] => {
+const useSearchedAndSortedOptions = <Option extends TOption>(term: string, options: Option[]): Option[] => {
   const throttledTerm = useThrottle(term, 100);
 
   return useMemo(
@@ -169,8 +138,7 @@ const useSearchedAndSortedOptions = <Option extends TOption>(
 const StyledComboboxOption = styled(ComboboxOption)<{
   $isSelectedOption: boolean; // Prevent prop to be rendered to the DOM by using Transient prop
 }>`
-  border-left: ${(x) =>
-    x.$isSelectedOption ? `5px solid ${x.theme.colors.blue8}` : '0'};
+  border-left: ${(x) => (x.$isSelectedOption ? `5px solid ${x.theme.colors.blue8}` : '0')};
 
   span:first-child {
     display: inline-block;
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 db997afd5d..a54f02b64e 100644
--- a/packages/app/src/domain/layout/components/gm-combo-box.tsx
+++ b/packages/app/src/domain/layout/components/gm-combo-box.tsx
@@ -15,22 +15,14 @@ export function GmComboBox(props: GmComboBoxProps) {
   const { commonTexts } = useIntl();
   const reverseRouter = useReverseRouter();
   const router = useRouter();
-  const expStr = new RegExp(["'s-"].join(' | '), 'g');
 
   return (
     <ComboBox
       placeholder={commonTexts.common.zoekveld_placeholder_gemeente}
       options={gmData}
       onSelect={({ gemcode }) => {
-        router.push(
-          typeof getLink === 'function'
-            ? getLink(gemcode)
-            : reverseRouter.gm.index(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)}
     />
   );
diff --git a/packages/app/src/domain/layout/components/vr-combo-box.tsx b/packages/app/src/domain/layout/components/vr-combo-box.tsx
index 104d576605..0def615508 100644
--- a/packages/app/src/domain/layout/components/vr-combo-box.tsx
+++ b/packages/app/src/domain/layout/components/vr-combo-box.tsx
@@ -20,14 +20,7 @@ export function VrComboBox(props: VrComboBoxProps) {
     <ComboBox
       placeholder={commonTexts.common.zoekveld_placeholder_regio}
       options={vrData}
-      onSelect={(region) =>
-        router.push(
-          typeof getLink === 'function'
-            ? getLink(region.code)
-            : reverseRouter.vr.index(region.code)
-        )
-      }
-      sorter={(a, b) => a.name.localeCompare(b.name)}
+      onSelect={(region) => router.push(typeof getLink === 'function' ? getLink(region.code) : reverseRouter.vr.index(region.code))}
       selectedOption={vrData.find((vr) => vr.code === selectedVrCode)}
     />
   );