Added geometry switch. This resolves #8045