Fixes timestamps on aggregregation, and fixes text based unique value counts.  With aggregration unit tests