Update Thumbnail get logic to do it correctly