Comment out OpenSearch autodiscovery until I can get it workring properly :-(