Consistent Highlighting

Fixed 2 inconsistent highlights - note about where the orange cells come
from.