fix: moving having clause outside the group by clause

fix: moving having clause outside the group by clause #683