Cleanup and updates to searching