improved wikipedia integration