Brain dead - Need to fix search issues as detailed in notebook