Include more info in tooltip