[BUGFIX] updates due to Gallery changes