Review fixes. Base it off content type of image