Make link explict
Fix index