Cleaned up the image query