fix: use findMatchingTag to get the end position as it is more robust

fix: use findMatchingTag to get the end position as it is more robust #1710