Expand important objects inside query