Replace 'SearchModel::SearchTree::entryPath(..)' by 'Common::ProtoHelper::getRelativePath(..)' plus other little things.