Added default image if image not present. few bug fixes