Enhancements on media refs. Must fix when media is not found on s3!