diff --git a/src/Schedule/Event.jsx b/src/Schedule/Event.jsx
index bf7d109..eef8413 100644
--- a/src/Schedule/Event.jsx
+++ b/src/Schedule/Event.jsx
@@ -4,7 +4,7 @@ import FeedbackLink from './FeedbackLink.jsx';
 
 export default function Event(event) {
     return (<>
-        <a href={'#lecture-'.concat(event.id)}>{event.title}</a>
+        <a href={'#event-'.concat(event.id)}>{event.title}</a>
         <br />
         {event.participant_users && !isTrackHidden(event.track) && <>
             {event.participant_users.map(speaker => speaker && <Speaker key={speaker.id} {...speaker} />)}
diff --git a/src/Schedule/Schedule.jsx b/src/Schedule/Schedule.jsx
index bdd4583..0b5adb6 100644
--- a/src/Schedule/Schedule.jsx
+++ b/src/Schedule/Schedule.jsx
@@ -62,18 +62,18 @@ export default function Schedule({
             <div className="separator"/>
             <table>
                 <tbody>
-                    {Object.entries(tracks).filter(([, track]) =>
+                    {Object.values(tracks).filter(track =>
                         !isTrackHidden(track)
-                    ).map(([trackId, track]) => <tr key={trackId}>
+                    ).map(track => <tr key={track.id}>
                         <td className={track.css_class}>{track.name[lang]}</td>
                     </tr>)}
-                    {Object.entries(langs).map(([code, name]) => <tr key={code}>
-                        <td className={'schedule-'.concat(code)}>{name}</td>
+                    {Object.entries(langs).map(([langId, langName]) => <tr key={langId}>
+                        <td className={'schedule-'.concat(langId)}>{langName}</td>
                     </tr>)}
                 </tbody>
             </table>
             <div className="separator" />
-            {Object.entries(events).map(([eventId, event]) => <section key={eventId} id={'lecture-'.concat(eventId)}>
+            {Object.values(events).map(event => <section key={event.id} id={'event-'.concat(event.id)}>
                 <p>
                     <strong>{event.title}</strong>
                     {event.participant_users && !isTrackHidden(event.track) && <>
@@ -92,14 +92,14 @@ export default function Schedule({
             </section>)}
             {<>
                 <div className="grid members">
-                    {Object.entries(speakers).map(([speakerId, speaker]) => <div key={speakerId} className="col4 wmember">
-                        <a href={'#'.concat(getSpeakerName(speaker))}>
+                    {Object.values(speakers).map(speaker => <div key={speaker.id} className="col4 wmember">
+                        <a href={'#'.concat(speaker.id)}>
                             <img width="100" height="100" src={defaultSpeaker} alt={getSpeakerName(speaker)} />
                         </a>
                     </div>)}
                 </div>
-                {Object.entries(speakers).map(([speakerId, speaker]) => <Fragment key={speakerId}>
-                    <div className="speaker" id={getSpeakerName(speaker)}>
+                {Object.values(speakers).map(speaker => <Fragment key={speaker.id}>
+                    <div className="speaker" id={'speaker-'.concat(speaker.id)}>
                         <img width="100" height="100" src={defaultSpeaker} alt={getSpeakerName(speaker)}/>
                         <h3>{getSpeakerName(speaker)}</h3>
                         <div className="icons">
diff --git a/src/Schedule/Speaker.jsx b/src/Schedule/Speaker.jsx
index 7001852..c6ef067 100644
--- a/src/Schedule/Speaker.jsx
+++ b/src/Schedule/Speaker.jsx
@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 
 export default function Speaker(speaker) {
     return (<>
-        <a href={'#'.concat(getSpeakerName(speaker))}>{getSpeakerName(speaker)}</a>
+        <a href={'#speaker-'.concat(speaker.id.toString())}>{getSpeakerName(speaker)}</a>
         {speaker.organisation && <>/&#8288;{speaker.organisation}&#8288;/</>}
     </>);
 }
 
 Speaker.propTypes = {
+    id: PropTypes.number.isRequired,
     first_name: PropTypes.string.isRequired,
     last_name: PropTypes.string.isRequired,
     organisation: PropTypes.string,
diff --git a/src/hooks/useCfpRequest.js b/src/hooks/useCfpRequest.js
index 9c3e8a3..ee11474 100644
--- a/src/hooks/useCfpRequest.js
+++ b/src/hooks/useCfpRequest.js
@@ -1,6 +1,6 @@
 import useSWR from 'swr';
 
-const fetcher = (...args) => fetch(...args).then(res => res.json());
+const fetcher = (input, init) => fetch(input, init).then(res => res.json());
 
 export default function useCfpRequest(path) {
     return useSWR(import.meta.env.VITE_CFP_BASE_URL.concat(path), fetcher);
diff --git a/src/hooks/useScheduleTable.js b/src/hooks/useScheduleTable.js
index e4b612c..6f7f6e3 100644
--- a/src/hooks/useScheduleTable.js
+++ b/src/hooks/useScheduleTable.js
@@ -3,14 +3,13 @@ export default function useScheduleTable({
     halls = {},
     lang,
 }) {
-    const hallIds = new Set(Object.keys(halls));
-    const header = Object.entries(halls).filter(([id]) => hallIds.has(id)).map(([id, hall]) => ({
-        id,
+    const header = Object.values(halls).map(hall => ({
+        id: hall.id,
         name: hall.name[lang],
     }));
 
-    const rows = Object.entries(events).map(([eventId, event]) => ({
-        id: eventId,
+    const rows = Object.values(events).map(event => ({
+        id: event.id,
         cells: [{
             id: 1,
             attributes: {
diff --git a/src/utils.js b/src/utils.js
index cf372a2..b7c313c 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -45,7 +45,7 @@ export function calculateProgress(...elements) {
 export const addIdAndRelations = (items, relations = []) =>
     Object.fromEntries(Object.entries(items).map(([id, item]) =>
         ([id, {
-            id,
+            id: parseInt(id, 10),
             ...item,
             ...Object.fromEntries(relations.map(([field, collection, idField]) => ([
                 field,