PictureChooser - bugs fixed