1) Fix image handling. Accidentally commented out by a previous commit! 2) Fix storage type handling. DO NOT SET storage type to empty string which is always invalid. I have no idea why that was changed. There is no reason to check the indbp parameter twice.