WIP on query args.