Fix query integrity
Merge remote-tracking branch 'origin/beta-3'