diff --git a/previews/PR496/changelog.html b/previews/PR496/changelog.html
index 9fe472242..f0585e298 100644
--- a/previews/PR496/changelog.html
+++ b/previews/PR496/changelog.html
@@ -304,6 +304,7 @@ <h3 class="anchored" data-anchor-id="fixed">Fixed</h3>
 <li>Initialization of <code>LateralSSF</code> variables <code>ssf</code> and <code>ssfmax</code> with vertical hydraulic conductivity profile <code>exponential_constant</code>. Removed parameter <code>khfrac</code> from the computation, as it is already part of parameter <code>kh_0</code>.</li>
 <li>Mutating BMI model control functions (<code>update</code>, <code>update_until</code> and <code>finalize</code>) and extended mutating BMI functions (<code>load_state</code> and <code>save_state</code>) should return <code>nothing</code>.</li>
 <li>Added downloading of testdata to Dockerfile, to ensure an image was able to build.</li>
+<li>The reservoir (<code>reservoir_index_f</code>) and lake (<code>lake_index_f</code>) indices as part of <code>network.river</code> were not correct. These were mapped to their own index in the <code>SimpleReservoir</code> and <code>Lake</code> struct, and not to the corresponding river index. This resulted in incorrect surface water abstractions from reservoir and lake volumes, and surface water abstractions were set at zero at the wrong river locations.</li>
 </ul>
 </section>
 <section id="changed" class="level3">
@@ -312,6 +313,8 @@ <h3 class="anchored" data-anchor-id="changed">Changed</h3>
 <li>Removed vertical concepts <code>HBV</code> and <code>FLEXTopo</code>.</li>
 <li>Removed metadata macros <code>exchange</code> and <code>grid_type</code>. The macro <code>grid_type</code> is not required because this functionality is already part of <code>BMI</code>. The macro <code>exchange</code> is replaced by a function used by <code>BMI</code>. Remaining metadata macros <code>get_units</code> and <code>grid_loc</code> are only used by <code>BMI</code>.</li>
 <li>Refactor the vertical <code>SBM</code> concept: divide the long struct <code>SBM</code> into different model components for interception, snow, glacier, (open water) runoff, soil, water demand and allocation stored in the struct <code>LandHydrologySBM</code>. Additionally, the atmospheric forcing and a shared vegetation parameterset are stored as separate fields in struct <code>LandHydrologySBM</code> (with soil model <code>SbmSoilModel</code>). The model component structs have model <code>variables</code>, <code>parameters</code> and <code>boundary_conditions</code> (if applicable), including associated functions for initializing and updating these model components. The original long update function of the <code>SBM</code> soil part has been split into separate functions.</li>
+<li>Refactor the lateral (routing) components: as for the vertical <code>SBM</code> concept split the structs into <code>variables</code>, <code>parameters</code> and <code>boundary_conditions</code> (if applicable).</li>
+<li>Timestepping method parameters for solving the kinematic wave and local inertial approaches for river and overland flow are moved to a <code>TimeStepping</code> struct. The timestepping implementation for the kinematic wave is now similar to the local inertial method: a stable timestep is computed for each sub timestep (or a fixed sub timestep is used) as part of a while loop (for each model timestep).</li>
 </ul>
 </section>
 <section id="added" class="level3">
diff --git a/previews/PR496/search.json b/previews/PR496/search.json
index 8ead0fac7..c393bfa9e 100644
--- a/previews/PR496/search.json
+++ b/previews/PR496/search.json
@@ -796,7 +796,7 @@
     "href": "changelog.html#unreleased",
     "title": "Changelog",
     "section": "Unreleased",
-    "text": "Unreleased\n\nFixed\n\nInitialization of LateralSSF variables ssf and ssfmax with vertical hydraulic conductivity profile exponential_constant. Removed parameter khfrac from the computation, as it is already part of parameter kh_0.\nMutating BMI model control functions (update, update_until and finalize) and extended mutating BMI functions (load_state and save_state) should return nothing.\nAdded downloading of testdata to Dockerfile, to ensure an image was able to build.\n\n\n\nChanged\n\nRemoved vertical concepts HBV and FLEXTopo.\nRemoved metadata macros exchange and grid_type. The macro grid_type is not required because this functionality is already part of BMI. The macro exchange is replaced by a function used by BMI. Remaining metadata macros get_units and grid_loc are only used by BMI.\nRefactor the vertical SBM concept: divide the long struct SBM into different model components for interception, snow, glacier, (open water) runoff, soil, water demand and allocation stored in the struct LandHydrologySBM. Additionally, the atmospheric forcing and a shared vegetation parameterset are stored as separate fields in struct LandHydrologySBM (with soil model SbmSoilModel). The model component structs have model variables, parameters and boundary_conditions (if applicable), including associated functions for initializing and updating these model components. The original long update function of the SBM soil part has been split into separate functions.\n\n\n\nAdded\n\nSupport direct output of snow and glacier melt, and add computation of snow water equivalent (SWE).",
+    "text": "Unreleased\n\nFixed\n\nInitialization of LateralSSF variables ssf and ssfmax with vertical hydraulic conductivity profile exponential_constant. Removed parameter khfrac from the computation, as it is already part of parameter kh_0.\nMutating BMI model control functions (update, update_until and finalize) and extended mutating BMI functions (load_state and save_state) should return nothing.\nAdded downloading of testdata to Dockerfile, to ensure an image was able to build.\nThe reservoir (reservoir_index_f) and lake (lake_index_f) indices as part of network.river were not correct. These were mapped to their own index in the SimpleReservoir and Lake struct, and not to the corresponding river index. This resulted in incorrect surface water abstractions from reservoir and lake volumes, and surface water abstractions were set at zero at the wrong river locations.\n\n\n\nChanged\n\nRemoved vertical concepts HBV and FLEXTopo.\nRemoved metadata macros exchange and grid_type. The macro grid_type is not required because this functionality is already part of BMI. The macro exchange is replaced by a function used by BMI. Remaining metadata macros get_units and grid_loc are only used by BMI.\nRefactor the vertical SBM concept: divide the long struct SBM into different model components for interception, snow, glacier, (open water) runoff, soil, water demand and allocation stored in the struct LandHydrologySBM. Additionally, the atmospheric forcing and a shared vegetation parameterset are stored as separate fields in struct LandHydrologySBM (with soil model SbmSoilModel). The model component structs have model variables, parameters and boundary_conditions (if applicable), including associated functions for initializing and updating these model components. The original long update function of the SBM soil part has been split into separate functions.\nRefactor the lateral (routing) components: as for the vertical SBM concept split the structs into variables, parameters and boundary_conditions (if applicable).\nTimestepping method parameters for solving the kinematic wave and local inertial approaches for river and overland flow are moved to a TimeStepping struct. The timestepping implementation for the kinematic wave is now similar to the local inertial method: a stable timestep is computed for each sub timestep (or a fixed sub timestep is used) as part of a while loop (for each model timestep).\n\n\n\nAdded\n\nSupport direct output of snow and glacier melt, and add computation of snow water equivalent (SWE).",
     "crumbs": [
       "Home",
       "Changelog"