Fixed combiqueries for filling lists, fixed group functionality