Add support for geocoding with plan ids