Fix: Query object can be Object or Array