vpavlin Fix how default image is loaded and decided