Improve links so it works for both public & private images