Fix apostrophe
Fix issues discussed in previous pull request
Use .get instead of .filter for Event lookups
Replace bad var name with updated reference
Fix Event capitalisation