Better handling of card image URLs