search-tool: Port a couple of fixes from master:
- Perform search immediately if Enter is pressed before timeout fires
- Fix unstable sort order for songs with the same title