Removed un-required query on event load
Added note about spoofed message issue to TODO