more changes to facilitate new photosets table