[BUGFIX] Cleanup for file collection. Lightbox bugfix for image