fix bug with filename when no domain is supplied
Merge branch 'case-integrity' into staging