Added detection of top / up links