Remove geo lookup when of type service , s.: #105

* add tests