Issue #77 adjusts searching
Issue #77 fixes the search module