Bugfix and improvements regarding the handling of external links