Ensure current_state is correct in event filters.