remake domain mapping
Merge pull request #1037 from dimagi/dom-indy

remake domain mapping