Implemented Tokenized Query Execution Event Builder
Arg validation tweak