It is not clear to me what case you are covering here. STI works when the selected entity is part of the discriminator map? Are there cases where that wouldn't be true?