Better urlencode + fix spec for compare url