Add support for querying aliased fields