Fix request URI generation, query string was stripped