IdentifierSearch + fix