Several changes. So much faster links search