Fix to handling of geometry type selectors