improve links for mashup