diff --git a/pom.xml b/pom.xml
index 01017d3..34a87f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
         <servlet-api.version>2.5</servlet-api.version>
         <httpclient.version>4.3.1</httpclient.version>
         <slf4j.version>1.7.5</slf4j.version>
+        <jetty.version>9.0.7.v20131107</jetty.version>
     </properties>
 
     <dependencies>
@@ -85,6 +86,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
diff --git a/prerender-java.iml b/prerender-java.iml
index f74aa01..5f16884 100644
--- a/prerender-java.iml
+++ b/prerender-java.iml
@@ -22,5 +22,10 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.0.7.v20131107" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.0.7.v20131107" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.0.7.v20131107" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.0.7.v20131107" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/main/java/com/github/greengerong/PreRenderSEOFilter.java b/src/main/java/com/github/greengerong/PreRenderSEOFilter.java
index 6eb721f..993e74b 100644
--- a/src/main/java/com/github/greengerong/PreRenderSEOFilter.java
+++ b/src/main/java/com/github/greengerong/PreRenderSEOFilter.java
@@ -14,7 +14,7 @@
 public class PreRenderSEOFilter implements Filter {
     public static final List<String> PARAMETER_NAMES = Lists.newArrayList("preRenderEventHandler", "proxy", "proxyPort",
             "prerenderToken", "forwardedURLHeader", "crawlerUserAgents", "extensionsToIgnore", "whitelist",
-            "blacklist", "prerenderServiceUrl");
+            "blacklist", "prerenderServiceUrl","serverName");
     private PrerenderSeoService prerenderSeoService;
 
     @Override
diff --git a/src/main/java/com/github/greengerong/PrerenderConfig.java b/src/main/java/com/github/greengerong/PrerenderConfig.java
index 90c2240..eed6ab7 100644
--- a/src/main/java/com/github/greengerong/PrerenderConfig.java
+++ b/src/main/java/com/github/greengerong/PrerenderConfig.java
@@ -21,6 +21,7 @@
 public class PrerenderConfig {
     private final static Logger log = LoggerFactory.getLogger(PrerenderConfig.class);
     public static final String PRERENDER_IO_SERVICE_URL = "http://service.prerender.io/";
+    public static final String SERVER_NAME = "http://movmix.com";
     private Map<String, String> config;
 
     public PrerenderConfig(Map<String, String> config) {
@@ -131,4 +132,9 @@ private String getDefaultPrerenderIoServiceUrl() {
         final String prerenderServiceUrlInEnv = System.getProperty("PRERENDER_SERVICE_URL");
         return isNotBlank(prerenderServiceUrlInEnv) ? prerenderServiceUrlInEnv : PRERENDER_IO_SERVICE_URL;
     }
+
+    public String getServerName() {
+        final String serverName = config.get("serverName");
+        return isNotBlank(serverName) ? serverName : SERVER_NAME;
+    }
 }
diff --git a/src/main/java/com/github/greengerong/PrerenderSeoService.java b/src/main/java/com/github/greengerong/PrerenderSeoService.java
index 250b075..ae9e28d 100644
--- a/src/main/java/com/github/greengerong/PrerenderSeoService.java
+++ b/src/main/java/com/github/greengerong/PrerenderSeoService.java
@@ -11,6 +11,7 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.message.HeaderGroup;
 import org.apache.http.util.EntityUtils;
+import org.eclipse.jetty.server.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -185,6 +186,20 @@ private String getRequestURL(HttpServletRequest request) {
                 return url;
             }
         }
+        //workaround for jetty and rewrite since all url are rewrite to index.html
+        //and we need the original url.
+        if (request instanceof org.eclipse.jetty.server.Request){
+            StringBuilder result = new StringBuilder();
+            String server = prerenderConfig.getServerName();
+            int port = request.getServerPort();
+            if(port != 80 && port != 443){
+                result.append(String.format("%s:%s", server, port));
+            }else {
+                result.append(server);
+            }
+            result.append(((Request)request).getUri());
+            return result.toString();
+        }
         return request.getRequestURL().toString();
     }
 
@@ -363,6 +378,9 @@ private void withPrerenderToken(HttpRequest proxyRequest) {
 
     private String getFullUrl(HttpServletRequest request) {
         final String url = getRequestURL(request);
+        if(url.contains("?")) {
+            return url;
+        }
         final String queryString = request.getQueryString();
         return isNotBlank(queryString) ? String.format("%s?%s", url, queryString) : url;
     }