Fixed bug in validEvents

Fixed bug in validEvents() where if an event encountered had a "from" state which was a wildcard, any previously filtered events would be wiped out with the list of all events. Now an event is considered valid for the current state if it's from matches either the current state or the wildcard.