Handle on-site images better