route toggling improvements