Fixed toggle and add/remove item conditions