Improve rdio matching