Improved TermIndexAtom