Added regex support in GeomSvc