Fix label for searching
Better naming of search results
Tests for searching