HSM strange behavior

It was indiscriminate about restoring lights. For example, if water alert went off, it would restore lights that had not been on before the alert, but that had been previously captured by an intrusion alert. The fix is to totally separate and distinguish before-alert lights setting by alert type.