#14 - better URLs for indicators