Fixed link-bugs with search