- Added boolAvatarSelected flag to handle empty avatars