Merged distance-search and polygon-search namespaces