Fix codepaths not properly followed when clicking links