Added possiblity to use more parameter in the ds query