CODE: fixed failed build matching
CODE: fixed compatibility with new markup