DocQuery fixed