[Wikipedia] Handle disambiguation pages and links better