Addressing two bugs:
#438 - setting the state to None if there is no further date scheduled (that should only happen for blank frequency)
#439 - checking the attributes in the stored state. I could not reproduce the issue, but I guess this could happen in some update scenarios.
