modified queries some.