Splitter: build the new query.
Merge conflict
Merge branch 'master' of https://github.com/XavierF56/BDA