diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/RedirectFilter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/RedirectFilter.java
index 1b332e8f6ddb..f71ea6381653 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/RedirectFilter.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/RedirectFilter.java
@@ -37,7 +37,6 @@ public ClientResponse handle(ClientRequest request) throws ClientHandlerExceptio
         }
 
         URI originalURI = request.getURI();
-        String queryString = originalURI.getQuery();
         request.setURI(locationManager.getRedirectedURI(originalURI));
 
         ClientResponse response = getNext().handle(request);
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ResourceLocationManager.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ResourceLocationManager.java
index 9c3d40d080e7..83e7e5586b65 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ResourceLocationManager.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/ResourceLocationManager.java
@@ -17,7 +17,6 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,10 +41,7 @@ public URI getRedirectedURI(URI originalURI) {
         String queryString = originalURI.getQuery();
 
         if (queryString != null && !queryString.isEmpty()) {
-            Map<String, String> queryParams = parseQueryString(queryString);
-            for (String key : new ArrayList<String>(queryParams.keySet())) {
-                uriBuilder.queryParam(key, queryParams.get(key));
-            }
+            uriBuilder.replaceQuery(queryString);
         }
         return uriBuilder.build();
     }
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListAccessPolicyOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListAccessPolicyOptions.java
index 2327574c985b..ca8bd29ab984 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListAccessPolicyOptions.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListAccessPolicyOptions.java
@@ -19,6 +19,6 @@
  * Options class for listing access policies
  * No options available at this time.
  */
-public class ListAccessPolicyOptions {
+public class ListAccessPolicyOptions extends ListOptions {
 
 }
diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListLocatorsOptions.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListLocatorsOptions.java
index aeb6797a6a1e..c5129f9cd069 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListLocatorsOptions.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/ListLocatorsOptions.java
@@ -17,6 +17,6 @@
 /**
  * The Class ListLocatorsOptions.
  */
-public class ListLocatorsOptions {
+public class ListLocatorsOptions extends ListOptions {
 
 }