DATA-1309 Images from NBII archived folders
Small tweaks.