Move parsed-params closer to the data query