[SWANcom] Evanced issues causing Enterprise catalogs to fail