keep comma in tokens to facilitate later parsing
expand DataQueryType_T and have parseDataTarget handle the time parsing