FIX: prevent double addition of Encounter objects to MarkedIndividual and Occurrence objects
L10N Improvements Part 1 - Backend fixes