tweaking expand queries