Better handling of query-time parameters