Preserve url-specific keywords in query string

Hey man, thanks for an awesome gem!
I fixed the issue #285, your thoughts on this approach?