Ensure classes between > and < are properly extracted
#17094
Merged
> and < are properly extracted
#17094