Solving issues #45 and adding some images on the current query