fixquery: Updated to accept parameter values as input