Better index link behavior

#1133