re #2546 - Add link ids to ease selenium testing