diff --git a/settings.gradle b/settings.gradle
index 0daffad9b55fb3fc714dee47c7498518e07b9de6..744b46c7afcbbbd77979a962daeb9a80bdc5f3f1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,12 +17,9 @@ git {
   def pass = System.getenv("GIT_NSHMP_PASSWORD")
 
   if (user && pass) {
-    fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git", {
-      name "nshmp-haz-dep--nshm-hi-2021"
-      tag "2.0.0"
-      // fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus.git", {
-      //   name "nshmp-haz-dep--nshm-conus-2018"
-      //   tag "main"
+    fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus.git", {
+      name "nshmp-haz-dep--nshm-conus-2018"
+      branch "origin/5.1.0-rc"
     })
   }
 }
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
index f4b7b1e98f8ac64783e6eed698dc7d8b60a64beb..449c5ec3a3dce6c42291dc8f652ba32d9e2839ec 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
@@ -15,7 +15,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.ListeningExecutorService;
@@ -58,8 +57,6 @@ public class ServletUtil {
 
   public static final int THREAD_COUNT;
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ServletUtil.class);
-
   @Value("${nshmp-haz.model-path}")
   private Path modelPath;
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index a525b1b8c1124939e10f9383e5f43409f8d99297..5d55dc9a93ace2c69a4771b3ee972b0ba985ddf2 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -77,7 +77,7 @@ public class DisaggController {
       description = "Disaggregation",
       responseCode = "200")
   @Get(
-      uri = "rp/{longitude}/{latitude}/{vs30}/{returnPeriod}{?imt}",
+      uri = "{longitude}/{latitude}/{vs30}/{returnPeriod}{?imt}",
       produces = MediaType.APPLICATION_JSON)
   public HttpResponse<String> doGetDisaggReturnPeriod(
       HttpRequest<?> http,
@@ -126,7 +126,7 @@ public class DisaggController {
       description = "Disaggregation",
       responseCode = "200")
   @Get(
-      uri = "iml/{longitude}/{latitude}/{vs30}",
+      uri = "{longitude}/{latitude}/{vs30}",
       produces = MediaType.APPLICATION_JSON)
   public HttpResponse<String> doGetDisaggIml(
       HttpRequest<?> http,
@@ -139,6 +139,10 @@ public class DisaggController {
       @Schema(
           minimum = "150",
           maximum = "3000") @PathVariable double vs30,
+      @QueryValue @Nullable Double PGA,
+      @QueryValue @Nullable Double SA0P2,
+      @QueryValue @Nullable Double SA1P0,
+      @QueryValue @Nullable Double SA5P0,
       @QueryValue @Nullable Set<DisaggDataType> out) {
 
     /*
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5ca3350641b37f5b8d35d94bb59f1bea3dc5b00b..c0eb1c75e398256544828f015cc40cb0a926480f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,5 +21,4 @@ nshmp-haz:
   # To specify the model to use:
   #     java -jar build/libs/nshmp-haz.jar --models=<path/to/models>
   #
-  model-path: ${models:libs/nshmp-haz-dep--nshm-hi-2021}
-  # model-path: ${models:libs/nshmp-haz-dep--nshm-conus-2018}
+  model-path: ${models:libs/nshmp-haz-dep--nshm-conus-2018}