Fixed entities in links & fences according to new spec