update to allow more events to be retrieved OOIION-998
@jamie-cyber1 Please review
Merge pull request #402 from MauriceManning/998_rebase

update to allow more events to be retrieved OOIION-998
OOIION-1342. Remove two unused computed attributes