case 3848 - Use complete id.
Merge branch 'case-3848' into new-search