Add support for assigning query-names.