Bug fix for geocoder_tokens.