Fixed up links lookup