add support for querying names. This is partial implementation