Slightly improve handles highlighting