AWS improvement. Find more images for non-Books