Finishing up structural changes for Named Entity URI searches