Improved image handling
adapted crop=false|null with recent changes