Improved overlap handling with Range Component