Add support for queries not include group by columns in display columns