Fixed bug where toggles weren't getting unhighlighted