Changed to trigger events necessary to switch proxying on mode switches closes #611 with #610 blocking