Tweak to thumb logic to check for higher res local image and also to ensure selected thumb is set