Updated wikipedia handler