Fixed some possible cases for vector denotation
Merge branch 'aggregation' into development