Finalize Event Table Format and Fix Querying