Improve link processing

Link tags using pipe will work slightly better.