V 1.10 - Removed hard coding for geometry service

Resolved Ticket - #336