Fix for multiple domains and cli/web entry