Added support for arbitrary query names (extended from integral identifiers).