Fixed problem with links in markup