[FIX] improvement on link click
[FIX] improvement on link click no 2