FIX update types before locations