Rework matcher for ehmbr parsing