Improved graph range detection and labels