fix issue 32, update ExtractSiteLinks code