switch to amdquery over selector