added datetime subscriber
added check for aggregated fields
Merge remote-tracking branch 'upstream/master'