Updated todo
Fixed photoset expansion