properly handle urls with query string. v0.1.0