More image fetching tweaking