fixes to search and link so they'll play nice