improved link retrieval