Query builder ready for the test version of Sylva.
More improvements in the models and files related to the analytics. We are testing all the changes little by little to see that all work correctly.