Handling some more uses of default home domain