Slimmed down queries some more for #81