Issue 19131: Fixed issue with wrong id being sent to find existing