VID-1898 Addresses comments on gallery helper