Updated queries using Fox's fix for labels being selected