case 3339 - Proper local/owner id fetch.
Merge branch 'case-3339' into new-search