Fixed items not unhighlighting properly