Added fix for an issue with broken search domain resolution