Improved wiki markup parsing