1.9: ----- * Fix and improve markup_element check for consistency