Adding NLP fixes and Geo base