Improved code for #90

URL only displayed when available