Added skipping of already present. handling of address not present trying to get location from type