Geo selectivity fix