Add a better check for the image number

[ThadHouse]

Currently we only check for the image number to be contained in the returned string. However this might not always work, so we should either regex it, or check it better.