Query by name is incomplete by close to being done