Handle New Query Format