Geography: update vocabulary
Exclude passive + if-then from the evaluation