Improve query système.

- Handle search with both OR and XOR.