More user-friendly subsonic tokens (#1269)