switches now use original visibility setting instead of always setting visibility false on trigger and true otherwise