Fix int/long/decimal/date/datetime aggregation + update example data