added checkboxes of option
merge from enhance_photo_album