Fix UVA subject and stateLocatedIn