A much cleaner domain mapping fix

Only need to filter once