restore deep search with reindex fix

this PR contains all of the deep search branch (already reviewed), plus the reindexing fix (commit 5809ea1).  Merged up from master so the diff from production will be visually evident.

@kevinchugh @gwprice