Cleanup dead
MLDS-567 Extend search to 2nd and 3rd email, and update index on change