[FIX] Files ending up in wrong gallery and other weirdness when there is more than one files field on a page