Fix URL not encoded problem