remove waste & use main query var