Image url point to bucket link
Replace base-url by request-url
Clear up names