formatting
adds a couple of hacks in order to make collection / cross domain work