Wikimedia subspp

Mostly changes to catch subspecies, varieties, and hybrids, as discussed in EoL curators list.
You have a comment about using nbsp here, but I don't see that getting used here. ...Is it handled elsewhere?  If so, could you comment with a hint about where?