Fixes #155 by checking for data and only hyperlinking icons when data there. Also restores URL cleanup on location link