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