Adding the possibility to add filters in the query