Make matching function not Pandora specific