improvements and location default image
default image ref used