Feature/323 link target fix