Fixing attachment/links search