changes to enable searching offline
Merge branch 'searching' into dev