Improve coverage support
Search refactoring
Do not sort search results