Tests and fixes
Manual merge
Better search results