Issue #77 fixes some search problems
Issue #77 merges with the ideas stream