added additional checking to the event selector cache so a cached selected event is not loaded improperly
Merge branch 'daltonbranch' into dev