Added new TODO
Updated to fix issue with ? being logged at start of querystring (unlike in CloudFront logs)
As a note: this bug only surfaced when we fixed #188 - the pattern of ??&e=xxx was working fine, whereas ??e=xxx broke
Added @Overrides to be a good Java citizen