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

remake domain mapping