Good point, and even sometimes those two tags don't fully cover the full range of the fetish.
You can have futanari (women born with or growing penises), transgender folk (transitioned), femboys (still guys but very feminine), traps (though this is a bit more of insult now it seems... I assume...