#7 Separate Caps from Query