improved wiki parsing