Fixed search mapping teardown handlers
Merge pull request #909 from reciprocity/hotfix/mapping-error-fix

Fixed search mapping teardown handlers
Merge remote-tracking branch 'origin/release/0.9a20' into develop