Fixed columns chooser to use aggregates correctly.