feat: Improve sorting and search results