Fix buffer issue, fixed non-unique URLs