Temporary bugfix for discovering links
Merged local and online