Fixed issue with loading event IDs
Merge remote-tracking branch 'origin/master'