Query builder - reset columns after aggregate

Related: #2564 #3105