Add basic aliasing for queries