Updated annotationfind