Change mechanism to get images to reduce duplicate calls
Add checks to ensure no invalid characters in file names