Photoalbum improvements

Merged the changes from QE and from RF 5, minor fixes.