Fix conversation query