Patch to fix search by path in map