Fixes to geolocation strategy, adding skipfaulties strategy