Pandora support tested and improved