Quick (and dirty?) fix to Wikipedia handler but at least the tests pass now