refactor socialUserId and entityId in string