Look forward further when disambiguating markers

Previously, we stopped at the next xml node. This now looks further if that first node doesn't contain a marker