Add domain to location factory

I used domain in a bunch of places in the form fallback stuff.  I can also make a factory locally in the cls if we do not want to add to much to the default factories here