Should we fix this in `query_params`?