add base url
add base url and remove swp