More fixes to findLink (tested and working at least once)