improved wikipedia matching