Oops, need to remove query objects from index and tests