Fixed import errors introduced in the previous commit
Fixed regexes in extractors
Update the OAI record if it is already present