Fixed an issue when record has no associated image
Added updates