Additional performance fixes regarding the link clicks.