Some preeliminary work for issue #172
Try to restore previous search engine after model reset, fixes #120
Merge branch 'master' of http://github.com/Emdek/otter