This is now fixed and uses the pet ID :) The sCode issue has also been fixed. More details on that here: https://subeta.net/forums.php/gotopost/64794561

Just a note- In the future, please keep to one bug report per topic, and make new topics for separate reports. Thank you!