Try to fix query
Add expand eveyrwhere