Modification of the queries