mod2 fix broken clickselect on images + fix broken sort on grouped + improve popover + refacto