More fixes to neighborhood highlighting and selection