Making last improvements for the query builder for the beta version of Sylva.