Update indices to make distinction with 0 being primary site
Defensive