A much cleaner domain mapping fix

Only need to filter once
Merge pull request #14 from danielbachhuber/fix-mapping-two

A much cleaner domain mapping fix