Adding a few more identifiers to the name query code

 These, however, are going to slam the DB, and might get removed
 soonish. I'm just updating it in case we need to riff off the code.