Fixed a bug in GeomSvc to handle different version of prop. tube naming