- small improvements on cluster id environment variable