Do not require python 2.7 for regular expression
Avoid failing with lookup error if no source field found, and no id present
Changes to pass unit tests