added links searching
some bugs fixed