Search updates

@abmargb please review all ???@abmargb??? sections