amended discovery query