These comments about name lookup also apply to the existing search feature - I missed this issue with it originally.