diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/utils/response-handler.utils.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/utils/response-handler.utils.ts
index 3ec535ff06c73218a39b9f50579ebd8b597498d3..d559b43c04c0fb992aa6d58cb082684b4d00d0af 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/utils/response-handler.utils.ts
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/utils/response-handler.utils.ts
@@ -1,5 +1,6 @@
-import {gmmUtils} from '@ghsc/nshmp-lib-ng/gmm';
-import {NshmpPlot} from '@ghsc/nshmp-lib-ng/plot';
+import {gmmUtils} from '@ghsc/nshmp-lib-no-ngrx/gmm';
+import {FormGroupControls} from '@ghsc/nshmp-lib-no-ngrx/nshmp';
+import {NshmpPlot} from '@ghsc/nshmp-lib-no-ngrx/plot';
 import {XySequence} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/data';
 import {Imt, imtToString} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/gmm';
 import {PlotlyPlot} from '@ghsc/nshmp-utils-ts/libs/plotly';
@@ -17,11 +18,14 @@ import {
  *
  * @param state The application state
  */
-export function createPlots(state: AppState): Map<string, NshmpPlot> {
+export function createPlots(
+  state: AppState,
+  form: FormGroupControls<ControlPanelForm>
+): Map<string, NshmpPlot> {
   const plots = new Map<string, NshmpPlot>();
   const groundMotionPlot = state.plots.get(Plots.GROUND_MOTION);
   const faultPlot = state.plots.get(Plots.FAULT);
-  const formValues = state.controlPanelForm.value;
+  const formValues = form.getRawValue();
 
   if (state.serviceResponses !== null && state.serviceResponses?.length !== 0) {
     const hoverTemplate = '%{x} km, %{y} AFE';