Trap doesn't belong if Jun's female doesn it?

No it shouldn't, provided that this is Jun after the use of his little magic trick to become female

I don't think it is.

VGK said:
I don't think it is.

It is! It totaly is, This is a screen shot from Relucks, DL and see for yourselves.
And Yeah Jun realy didn't change that much when genderswaped, although the CG set had more from the Genderswap tree, including more explicit images that show he's all woman.

Oh and since he still looks more or less the same should androgynous be added to the list?

The androgynous tag is for characters where you really can't tell if it's male or female, and it usually goes hand-in-hand with the trap and reverse_trap tags. Since Jun's biology now matches his appearance, I think the genderswap tag is sufficient.